X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fsigsession.cpp;h=719f9ded3610b948438c65a2ebda098d76555f53;hb=819f4c25391a9c74d3d2f528d462142d5c4aad4d;hp=8cfd86d9a9782fc340c6fdebf9103d8edba96c3c;hpb=269528f55e7fd77f762c2008d257921cd30e1519;p=pulseview.git

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index 8cfd86d..719f9de 100644
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -47,8 +47,14 @@
 
 #include <QDebug>
 
-using namespace boost;
-using namespace std;
+using boost::dynamic_pointer_cast;
+using boost::function;
+using boost::lock_guard;
+using boost::mutex;
+using boost::shared_ptr;
+using std::map;
+using std::string;
+using std::vector;
 
 namespace pv {
 
@@ -85,6 +91,9 @@ struct sr_dev_inst* SigSession::get_device() const
 
 void SigSession::set_device(struct sr_dev_inst *sdi)
 {
+	// Ensure we are not capturing before setting the device
+	stop_capture();
+
 	if (_sdi)
 		_device_manager.release_device(_sdi);
 	if (sdi)