X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fsigsession.cpp;h=e42ba2cbdc3f997d73f67e0b855f6affb4f55e0b;hb=9632990d5428efb120d1085d4f441ad371d447fc;hp=87b561eb11ccc8a09aea5db2b1f2f652810a5344;hpb=b1e8c93d824986328a34d1c36273cb534fd65307;p=pulseview.git

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index 87b561eb..e42ba2cb 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())