Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Instrument Control
NomadSpecialModules
Commits
9214b370
Commit
9214b370
authored
Sep 05, 2017
by
Locatelli
Browse files
check m_loopThread exited during destruction of controller. Needed for
unit tests
parent
352bc5e5
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/controllers/vexp/VEXPController.cpp
View file @
9214b370
...
...
@@ -31,6 +31,8 @@ const int32 VEXPController::BAD_PARAMETERS = 2;
VEXPController
::
VEXPController
(
const
string
&
name
)
:
ExperimentController
(
name
),
m_running
(
true
),
m_errorDuringCalculation
(
false
)
{
m_loopThread
.
reset
();
setFamily
(
family
::
HIDDEN
);
as
.
init
(
this
,
NOSAVE
,
"as"
);
...
...
@@ -95,8 +97,9 @@ VEXPController::~VEXPController() {
m_waitCondition
.
notify_one
();
}
m_loopThread
->
join
();
}
if
(
m_loopThread
.
get
()
!=
NULL
)
{
m_loopThread
->
join
();
}}
void
VEXPController
::
updateUMatrix
()
{
u
.
update
(
sample
->
uRef
());
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment