X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdevices%2Finputfile.cpp;h=94fb9c82cb6d4df2e2a47d261ff8220bb471ad3e;hp=8e973f0561718d33fcd58afbc40659696e41417a;hb=f4ab4b5c657e5613caba82feaa81a8a400e4f331;hpb=1325ce422f1b49ab1f693125105b8c373c2965e5

diff --git a/pv/devices/inputfile.cpp b/pv/devices/inputfile.cpp
index 8e973f0..94fb9c8 100644
--- a/pv/devices/inputfile.cpp
+++ b/pv/devices/inputfile.cpp
@@ -86,7 +86,7 @@ InputFile::InputFile(const shared_ptr<sigrok::Context> &context,
 			settings.endGroup();
 		}
 
-	} catch (out_of_range) {
+	} catch (out_of_range&) {
 		qWarning() << "Could not find input format" << format_name <<
 			"needed to restore session input file";
 	}
@@ -101,7 +101,7 @@ void InputFile::save_meta_to_settings(QSettings &settings)
 	settings.setValue("options", (int)options_.size());
 
 	int i = 0;
-	for (pair<string, Glib::VariantBase> option : options_) {
+	for (const pair<string, Glib::VariantBase>& option : options_) {
 		settings.beginGroup("option" + QString::number(i));
 		settings.setValue("name", QString::fromStdString(option.first));
 		GlobalSettings::store_variantbase(settings, option.second);
@@ -133,15 +133,16 @@ void InputFile::open()
 
 	f->read(buffer.data(), BufferSize);
 	const streamsize size = f->gcount();
+
 	if (size == 0)
-		return;
+		throw QString("Failed to read file");
 
 	input_->send(buffer.data(), size);
 
 	try {
 		device_ = input_->device();
-	} catch (sigrok::Error&) {
-		return;
+	} catch (sigrok::Error& e) {
+		throw e;
 	}
 
 	session_->add_device(device_);