X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.cpp;h=797a461bf2d6ffbec1cb3deab085df21abfdb283;hp=7df73d63d5ba43660eb666ec1a91322046002442;hb=e170ab6531b39e51dce725f000fddd57b88d8561;hpb=1325ce422f1b49ab1f693125105b8c373c2965e5

diff --git a/pv/session.cpp b/pv/session.cpp
index 7df73d6..797a461 100644
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -397,12 +397,13 @@ void Session::set_device(shared_ptr<devices::Device> device)
 	name_ = default_name_;
 	name_changed();
 
-	// Remove all stored data
+	// Remove all stored data and reset all views
 	for (shared_ptr<views::ViewBase> view : views_) {
 		view->clear_signals();
 #ifdef ENABLE_DECODE
 		view->clear_decode_signals();
 #endif
+		view->reset_view_state();
 	}
 	for (const shared_ptr<data::SignalData> d : all_signal_data_)
 		d->clear();
@@ -949,7 +950,11 @@ void Session::sample_thread_proc(function<void (const QString)> error_handler)
 	if (!device_)
 		return;
 
-	cur_samplerate_ = device_->read_config<uint64_t>(ConfigKey::SAMPLERATE);
+	try {
+		cur_samplerate_ = device_->read_config<uint64_t>(ConfigKey::SAMPLERATE);
+	} catch (Error& e) {
+		cur_samplerate_ = 0;
+	}
 
 	out_of_memory_ = false;
 
@@ -1160,7 +1165,11 @@ void Session::feed_in_logic(shared_ptr<Logic> logic)
 	}
 
 	if (!cur_samplerate_)
-		cur_samplerate_ = device_->read_config<uint64_t>(ConfigKey::SAMPLERATE);
+		try {
+			cur_samplerate_ = device_->read_config<uint64_t>(ConfigKey::SAMPLERATE);
+		} catch (Error& e) {
+			// Do nothing
+		}
 
 	lock_guard<recursive_mutex> lock(data_mutex_);
 
@@ -1197,7 +1206,11 @@ void Session::feed_in_analog(shared_ptr<Analog> analog)
 	}
 
 	if (!cur_samplerate_)
-		cur_samplerate_ = device_->read_config<uint64_t>(ConfigKey::SAMPLERATE);
+		try {
+			cur_samplerate_ = device_->read_config<uint64_t>(ConfigKey::SAMPLERATE);
+		} catch (Error& e) {
+			// Do nothing
+		}
 
 	lock_guard<recursive_mutex> lock(data_mutex_);