Fix compilation on 32-bit systems

[pulseview.git] / pv / sigsession.cpp

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index 84e1d48fdf19b0f62747745e0d60215d8330c066..e42ba2cbdc3f997d73f67e0b855f6affb4f55e0b 100644 (file)
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -47,8 +47,8 @@
 
 #include <QDebug>
 
-using boost::function;
 using std::dynamic_pointer_cast;
+using std::function;
 using std::lock_guard;
 using std::mutex;
 using std::list;
@@ -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())
@@ -448,7 +444,7 @@ void SigSession::sample_thread_proc(shared_ptr<device::DevInst> dev_inst,
                return;
        }
 
-       set_capture_state(dev_inst->is_trigger_enabled() ?
+       set_capture_state(sr_session_trigger_get() ?
                AwaitingTrigger : Running);
 
        dev_inst->run();