X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=1a05907c9c1a4470be862fdf2691887411b915e3;hp=912ed607f200bc431e9772c2514b8d186dd3917b;hb=4b0d7046aded75445a836d0d8c0f687938398f81;hpb=bea236d6477733808a8018bf712c8f2ff9b65678

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 912ed607..1a05907c 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -274,7 +274,7 @@ void MainWindow::export_file(shared_ptr<OutputFormat> format,
 		filter += "(*.*)";
 	else
 		filter += QString("(*.%1);;%2 (*.*)").arg(
-			QString::fromStdString(join(exts, ", *."))).arg(
+			QString::fromStdString(join(exts, ", *.")),
 			tr("All Files"));
 
 	// Show the file dialog
@@ -315,7 +315,7 @@ void MainWindow::import_file(shared_ptr<InputFormat> format)
 	const vector<string> exts = format->extensions();
 	const QString filter = exts.empty() ? "" :
 		tr("%1 files (*.%2)").arg(
-			QString::fromStdString(format->description())).arg(
+			QString::fromStdString(format->description()),
 			QString::fromStdString(join(exts, ", *.")));
 
 	// Show the file dialog
@@ -567,8 +567,9 @@ void MainWindow::select_init_device()
 	QSettings settings;
 	map<string, string> dev_info;
 	list<string> key_list;
+	shared_ptr<devices::HardwareDevice> device;
 
-	// Re-select last used device if possible.
+	// Re-select last used device if possible but only if it's not demo
 	settings.beginGroup("Device");
 	key_list.push_back("vendor");
 	key_list.push_back("model");
@@ -586,8 +587,24 @@ void MainWindow::select_init_device()
 			dev_info.insert(std::make_pair(key, value));
 	}
 
-	const shared_ptr<devices::HardwareDevice> device =
-		device_manager_.find_device_from_info(dev_info);
+	if (dev_info.count("model") > 0)
+		if (dev_info.at("model").find("Demo device") == std::string::npos)
+			device = device_manager_.find_device_from_info(dev_info);
+
+	// When we can't find a device similar to the one we used last
+	// time and there is at least one device aside from demo, use it
+	if (!device) {
+		for (shared_ptr<devices::HardwareDevice> dev : device_manager_.devices()) {
+			dev_info = device_manager_.get_device_info(dev);
+
+			if (dev_info.count("model") > 0)
+				if (dev_info.at("model").find("Demo device") == std::string::npos) {
+					device = dev;
+					break;
+				}
+		}
+	}
+
 	select_device(device);
 	update_device_list();