X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsigsession.cpp;h=b5387877dda0a73a513f7cb5f066e030f3b17539;hp=10ea4ffbea6dc1ad4e171b9054289e938fad66f0;hb=6d483b8b51b4efceacf2f48776af33550bf5d29e;hpb=27d7c96b57d967edd8bcde9bb5570d573a0ef474

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index 10ea4ffb..b5387877 100644
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -75,7 +75,8 @@ SigSession::~SigSession()
 {
 	stop_capture();
 
-	_sampling_thread.join();
+	if (_sampling_thread.joinable())
+		_sampling_thread.join();
 
 	if (_dev_inst)
 		_device_manager.release_device(_dev_inst);
@@ -200,7 +201,8 @@ void SigSession::stop_capture()
 	sr_session_stop();
 
 	// Check that sampling stopped
-	_sampling_thread.join();
+	if (_sampling_thread.joinable())
+		_sampling_thread.join();
 }
 
 set< shared_ptr<data::SignalData> > SigSession::get_data() const