X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=0089b112a721f1585a9813134328cfd30c360ccb;hp=fcc929e988c12d8f1755be8b436c1b348b77447f;hb=e95e8563a1de0d2045cb8f30083889896b6c94df;hpb=f69ec72d3cead13847045ca9cdf15d503f69e370

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index fcc929e9..0089b112 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -299,11 +299,9 @@ void MainWindow::update_device_list()
 	if (std::find(devices.begin(), devices.end(), selected_device) ==
 		devices.end())
 		devices.push_back(selected_device);
+	assert(selected_device);
 
-	_sampling_bar->set_device_list(devices);
-
-	if (selected_device)
-		_sampling_bar->set_selected_device(selected_device);
+	_sampling_bar->set_device_list(devices, selected_device);
 }
 
 void MainWindow::load_file(QString file_name)
@@ -316,6 +314,9 @@ void MainWindow::load_file(QString file_name)
 		_session.set_file(file_name.toStdString());
 	} catch(QString e) {
 		show_session_error(tr("Failed to load ") + file_name, e);
+		_session.set_default_device();
+		update_device_list();
+		return;
 	}
 
 	update_device_list();