projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test/CMakeLists.txt: Drop obsolete boost-thread references.
[pulseview.git]
/
pv
/
sigsession.cpp
diff --git
a/pv/sigsession.cpp
b/pv/sigsession.cpp
index cbcbaa8897e3add1bf5506e2c31a8438da14108a..e42ba2cbdc3f997d73f67e0b855f6affb4f55e0b 100644
(file)
--- a/
pv/sigsession.cpp
+++ b/
pv/sigsession.cpp
@@
-77,11
+77,9
@@
SigSession::~SigSession()
{
using pv::device::Device;
{
using pv::device::Device;
+ // Stop and join to the thread
stop_capture();
stop_capture();
- if (_sampling_thread.joinable())
- _sampling_thread.join();
-
_dev_inst->release();
// TODO: This should not be necessary
_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()
{
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())
// Check that sampling stopped
if (_sampling_thread.joinable())
@@
-448,7
+444,7
@@
void SigSession::sample_thread_proc(shared_ptr<device::DevInst> dev_inst,
return;
}
return;
}
- set_capture_state(
dev_inst->is_trigger_enabled
() ?
+ set_capture_state(
sr_session_trigger_get
() ?
AwaitingTrigger : Running);
dev_inst->run();
AwaitingTrigger : Running);
dev_inst->run();