X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fsigsession.cpp;h=e42ba2cbdc3f997d73f67e0b855f6affb4f55e0b;hb=e40b2f294066331dc04598f4b0dccac2bab7c295;hp=cbcbaa8897e3add1bf5506e2c31a8438da14108a;hpb=d23445348bf04a698e062a3b917360313ecbcaad;p=pulseview.git

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index cbcbaa8..e42ba2c 100644
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -77,11 +77,9 @@ SigSession::~SigSession()
 {
 	using pv::device::Device;
 
+	// Stop and join to the thread
 	stop_capture();
 
-	if (_sampling_thread.joinable())
-		_sampling_thread.join();
-
 	_dev_inst->release();
 
 	// TODO: This should not be necessary
@@ -195,10 +193,8 @@ void SigSession::start_capture(function<void (const QString)> error_handler)
 
 void SigSession::stop_capture()
 {
-	if (get_capture_state() == Stopped)
-		return;
-
-	sr_session_stop();
+	if (get_capture_state() != Stopped)
+		sr_session_stop();
 
 	// Check that sampling stopped
 	if (_sampling_thread.joinable())
@@ -448,7 +444,7 @@ void SigSession::sample_thread_proc(shared_ptr<device::DevInst> dev_inst,
 		return;
 	}
 
-	set_capture_state(dev_inst->is_trigger_enabled() ?
+	set_capture_state(sr_session_trigger_get() ?
 		AwaitingTrigger : Running);
 
 	dev_inst->run();