X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=dcbaf1812ab268765e626d69f5c280042c6ff65e;hp=ca514bf97a703eba3e7a8bc56dbebd23467c439a;hb=dc0867ff7ec693953afb62f9512ad7dd3339a2b2;hpb=363107a8c9f33d8aeebd9ee8d56f90af87c73ea2

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index ca514bf9..dcbaf181 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -60,7 +60,8 @@ MainWindow::MainWindow(DeviceManager &device_manager,
 	const char *open_file_name,
 	QWidget *parent) :
 	QMainWindow(parent),
-	_device_manager(device_manager)
+	_device_manager(device_manager),
+	_session(device_manager)
 {
 	setup_ui();
 	if (open_file_name) {
@@ -278,10 +279,12 @@ void MainWindow::on_actionOpen_triggered()
 void MainWindow::on_actionConnect_triggered()
 {
 	dialogs::Connect dlg(this, _device_manager);
-	if (!dlg.exec())
-		return;
 
-	struct sr_dev_inst *const sdi = dlg.get_selected_device();
+	// If the user selected a device, select it in the device list. Select the
+	// current device otherwise.
+	struct sr_dev_inst *const sdi = dlg.exec() ?
+		dlg.get_selected_device() : _session.get_device();
+
 	update_device_list(sdi);
 }