X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdevices%2Finputfile.cpp;h=935b0c47bdf6e41714bf889a530af61513ccb420;hb=46a0cadc74ca39a7bb8b3a4a4622ab7788a28f3b;hp=13af3db9cd85c791935da6c80bf1a14220d492a0;hpb=4d6c6ea3e6b069787c270d4911083dae05eae4c6;p=pulseview.git

diff --git a/pv/devices/inputfile.cpp b/pv/devices/inputfile.cpp
index 13af3db9..935b0c47 100644
--- a/pv/devices/inputfile.cpp
+++ b/pv/devices/inputfile.cpp
@@ -36,36 +36,44 @@ InputFile::InputFile(const std::shared_ptr<sigrok::Context> &context,
 	const std::map<std::string, Glib::VariantBase> &options) :
 	File(file_name),
 	context_(context),
-	input_(format->create_input(options)),
-	interrupt_(false) {
-	if (!input_)
-		throw QString("Failed to create input");
+	format_(format),
+	options_(options),
+	interrupt_(false)
+{
 }
 
-void InputFile::open() {
+void InputFile::open()
+{
 	if (session_)
 		close();
-
-	session_ = context_->create_session();
+	else
+		session_ = context_->create_session();
 }
 
-void InputFile::close() {
+void InputFile::close()
+{
 	if (session_)
 		session_->remove_devices();
 }
 
-void InputFile::start() {
+void InputFile::start()
+{
 }
 
-void InputFile::run() {
+void InputFile::run()
+{
 	char buffer[BufferSize];
 	bool need_device = true;
 
 	assert(session_);
-	assert(input_);
+
+	input_ = format_->create_input(options_);
+
+	if (!input_)
+		throw QString("Failed to create input");
 
 	interrupt_ = false;
-	std::ifstream f(file_name_);
+	std::ifstream f(file_name_, std::ios::binary);
 	while (!interrupt_ && f) {
 		f.read(buffer, BufferSize);
 		const std::streamsize size = f.gcount();
@@ -81,6 +89,7 @@ void InputFile::run() {
 				break;
 			}
 
+			session_->remove_devices(); // Remove instance from previous run
 			session_->add_device(device_);
 			need_device = false;
 		}
@@ -92,7 +101,8 @@ void InputFile::run() {
 	input_->end();
 }
 
-void InputFile::stop() {
+void InputFile::stop()
+{
 	interrupt_ = true;
 }