projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix SVG icons not being displayed on Windows.
[pulseview.git]
/
pv
/
sigsession.cpp
diff --git
a/pv/sigsession.cpp
b/pv/sigsession.cpp
index 8cfd86d9a9782fc340c6fdebf9103d8edba96c3c..719f9ded3610b948438c65a2ebda098d76555f53 100644
(file)
--- a/
pv/sigsession.cpp
+++ b/
pv/sigsession.cpp
@@
-47,8
+47,14
@@
#include <QDebug>
#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 {
namespace pv {
@@
-85,6
+91,9
@@
struct sr_dev_inst* SigSession::get_device() const
void SigSession::set_device(struct sr_dev_inst *sdi)
{
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)
if (_sdi)
_device_manager.release_device(_sdi);
if (sdi)