X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.cpp;h=b8e98ece9a5dce42ce5e6e774e689bd34abed5a0;hp=73dd339b60fea95259d6fddc7aace7ec9f3ad0e1;hb=168bd8ac353d715257e7267dcf4eeb1aaef6365c;hpb=2b05d3110a0a50ce93c8c887a2dc00c1375e92fa

diff --git a/pv/session.cpp b/pv/session.cpp
index 73dd339b..b8e98ece 100644
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -161,7 +161,15 @@ void Session::set_device(shared_ptr<devices::Device> device)
 	signals_changed();
 
 	device_ = std::move(device);
-	device_->open();
+
+	try {
+		device_->open();
+	} catch (const QString &e) {
+		device_.reset();
+		device_selected();
+		throw;
+	}
+
 	device_->session()->add_datafeed_callback([=]
 		(shared_ptr<sigrok::Device> device, shared_ptr<Packet> packet) {
 			data_feed_in(device, packet);