{
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
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())
return;
}
- set_capture_state(dev_inst->is_trigger_enabled() ?
+ set_capture_state(sr_session_trigger_get() ?
AwaitingTrigger : Running);
dev_inst->run();