X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fsession.cpp;h=b90c03016d6b42cc924787710c7e547685728dd7;hb=ce11b2ea851633dc937881cdbd358541685b43be;hp=08bec08e4a5f664b87c0c30f2333c603861ce9fd;hpb=5237f0c50352b523c6a0c3d7f931081ecdbdecaa;p=pulseview.git

diff --git a/pv/session.cpp b/pv/session.cpp
index 08bec08..b90c030 100644
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -90,7 +90,6 @@ Session::Session(DeviceManager &device_manager) :
 	capture_state_(Stopped),
 	cur_samplerate_(0)
 {
-	set_default_device();
 }
 
 Session::~Session()
@@ -180,6 +179,11 @@ void Session::start_capture(function<void (const QString)> error_handler)
 		}
 	}
 
+	// Clear signal data
+	const set< shared_ptr<data::SignalData> > signal_data = get_data();
+	for (const shared_ptr<data::SignalData> d : signal_data)
+		d->clear();
+
 	// Begin the session
 	sampling_thread_ = std::thread(
 		&Session::sample_thread_proc, this, device_,
@@ -412,6 +416,8 @@ void Session::sample_thread_proc(shared_ptr<devices::Device> device,
 	assert(device);
 	assert(error_handler);
 
+	(void)device;
+
 	cur_samplerate_ = device_->read_config<uint64_t>(ConfigKey::SAMPLERATE);
 
 	try {