X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fsession.cpp;h=bbfb7d2437b1c3380d955e8ef3ce3301797a2882;hb=238419770d6bc2d5e4db3dd6e15fec32eb2a3dc6;hp=08bec08e4a5f664b87c0c30f2333c603861ce9fd;hpb=5237f0c50352b523c6a0c3d7f931081ecdbdecaa;p=pulseview.git

diff --git a/pv/session.cpp b/pv/session.cpp
index 08bec08e..bbfb7d24 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_,
@@ -234,9 +238,9 @@ bool Session::add_decoder(srd_decoder *const dec)
 
 		// Make a list of all the channels
 		std::vector<const srd_channel*> all_channels;
-		for(const GSList *i = dec->channels; i; i = i->next)
+		for (const GSList *i = dec->channels; i; i = i->next)
 			all_channels.push_back((const srd_channel*)i->data);
-		for(const GSList *i = dec->opt_channels; i; i = i->next)
+		for (const GSList *i = dec->opt_channels; i; i = i->next)
 			all_channels.push_back((const srd_channel*)i->data);
 
 		// Auto select the initial channels
@@ -298,7 +302,7 @@ void Session::set_capture_state(capture_state state)
 	lock_guard<mutex> lock(sampling_mutex_);
 	const bool changed = capture_state_ != state;
 	capture_state_ = state;
-	if(changed)
+	if (changed)
 		capture_state_changed(state);
 }
 
@@ -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 {