X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fstoresession.cpp;h=f60cd26cc621ec9225e16ef57ed37ad2113e80d9;hb=f9abf97e78bc4825d80926b0ebc6cbaef40768b1;hp=ebb4b0ed374349e657fff6e14373c244afa23310;hpb=0fbda3c2dda9357776afa15e99c037eb0cc97214;p=pulseview.git

diff --git a/pv/storesession.cpp b/pv/storesession.cpp
index ebb4b0e..f60cd26 100644
--- a/pv/storesession.cpp
+++ b/pv/storesession.cpp
@@ -25,16 +25,16 @@
 #include <pv/data/logicsnapshot.h>
 #include <pv/view/signal.h>
 
-using boost::dynamic_pointer_cast;
 using boost::mutex;
-using boost::shared_ptr;
 using boost::thread;
 using boost::lock_guard;
 using std::deque;
+using std::dynamic_pointer_cast;
 using std::make_pair;
 using std::min;
 using std::pair;
 using std::set;
+using std::shared_ptr;
 using std::string;
 using std::vector;
 
@@ -135,7 +135,8 @@ bool StoreSession::start()
 
 void StoreSession::wait()
 {
-	_thread.join();
+	if (_thread.joinable())
+		_thread.join();
 }
 
 void StoreSession::cancel()