X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fsession.cpp;h=2cdc25f83ed0ee3c718896da9d8df98d13f34876;hb=30d6f09f5eec0fb18d5c87347b5de6124a56a63c;hp=27154d13cd238c8713e4aab4f5415fa773cbd123;hpb=da30ecb7e72bd2547e524258efa5ec642988b70b;p=pulseview.git

diff --git a/pv/session.cpp b/pv/session.cpp
index 27154d1..2cdc25f 100644
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -133,7 +133,6 @@ void Session::set_device(shared_ptr<devices::Device> device)
 		(shared_ptr<sigrok::Device> device, shared_ptr<Packet> packet) {
 			data_feed_in(device, packet);
 		});
-	device_manager_.update_display_name(device_);
 	update_signals(device_);
 
 	decode_traces_.clear();
@@ -401,7 +400,12 @@ shared_ptr<view::Signal> Session::signal_from_channel(
 void Session::read_sample_rate(shared_ptr<sigrok::Device> device)
 {
 	assert(device);
-	const auto keys = device->config_keys(ConfigKey::DEVICE_OPTIONS);
+	map< const ConfigKey*, set<sigrok::Capability> > keys;
+
+	try {
+		keys = device->config_keys(ConfigKey::DEVICE_OPTIONS);
+	} catch (const Error) {}
+
 	const auto iter = keys.find(ConfigKey::SAMPLERATE);
 	cur_samplerate_ = (iter != keys.end() &&
 		(*iter).second.find(sigrok::GET) != (*iter).second.end()) ?