X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=fcc929e988c12d8f1755be8b436c1b348b77447f;hb=32d83ce1a26322a433785746ea7465f9bdf830b6;hp=2a74d5b292a40f8ac6ecaf42ba1dbdc791eef7a5;hpb=d873f4d685e16c708a15fcde12fbbec66650511c;p=pulseview.git

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 2a74d5b2..fcc929e9 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -220,7 +220,7 @@ void MainWindow::setup_ui()
 		"MainWindow", "&Decoders", 0, QApplication::UnicodeUTF8));
 
 	pv::widgets::DecoderMenu *const menu_decoders_add =
-		new pv::widgets::DecoderMenu(menu_decoders);
+		new pv::widgets::DecoderMenu(menu_decoders, true);
 	menu_decoders_add->setTitle(QApplication::translate(
 		"MainWindow", "&Add", 0, QApplication::UnicodeUTF8));
 	connect(menu_decoders_add, SIGNAL(decoder_selected(srd_decoder*)),
@@ -296,6 +296,10 @@ void MainWindow::update_device_list()
 	std::copy(_device_manager.devices().begin(),
 		_device_manager.devices().end(), std::back_inserter(devices));
 
+	if (std::find(devices.begin(), devices.end(), selected_device) ==
+		devices.end())
+		devices.push_back(selected_device);
+
 	_sampling_bar->set_device_list(devices);
 
 	if (selected_device)
@@ -314,6 +318,8 @@ void MainWindow::load_file(QString file_name)
 		show_session_error(tr("Failed to load ") + file_name, e);
 	}
 
+	update_device_list();
+
 	_session.start_capture(boost::bind(&MainWindow::session_error, this,
 		errorMessage, infoMessage));
 }