X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=eb567af8dfe077d4954ffe6613333e7bb2f61da2;hp=767ab6f31149bd4881b0db163635c86025c08818;hb=859ca3070b30afde85ac345e8761ebf3b10017b1;hpb=951b5ae77957c8086f05fcd2b26beaf32f3e8e3e

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 767ab6f..eb567af 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -194,7 +194,10 @@ void MainWindow::run_stop()
 void MainWindow::select_device(shared_ptr<devices::Device> device)
 {
 	try {
-		session_.set_device(device);
+		if (device)
+			session_.set_device(device);
+		else
+			session_.set_default_device();
 	} catch(const QString &e) {
 		QMessageBox msg(this);
 		msg.setText(e);
@@ -540,10 +543,8 @@ void MainWindow::restore_ui_settings()
 
 	const shared_ptr<devices::HardwareDevice> device =
 		device_manager_.find_device_from_info(dev_info);
-	if (device) {
-		select_device(device);
-		update_device_list();
-	}
+	select_device(device);
+	update_device_list();
 
 	settings.endGroup();
 }