Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Instrument Control
NomadSpecialModules
Commits
8f716bd9
Commit
8f716bd9
authored
Jul 03, 2017
by
Locatelli
Browse files
set NULL to m_serverthread in the constructor
parent
0b029aea
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/controllers/stereo_watchdog/StereoWatchdogController.cpp
View file @
8f716bd9
...
...
@@ -53,6 +53,8 @@ StereoWatchdogController::StereoWatchdogController(const string& name) :Experime
m_Level2Driver
.
init
(
this
,
"level2driver"
);
registerFunction
(
TYPE
);
m_serverThread
=
NULL
;
}
...
...
@@ -77,8 +79,10 @@ StereoWatchdogController::StereoWatchdogController(const StereoWatchdogControlle
* Destructor
*/
StereoWatchdogController
::~
StereoWatchdogController
()
{
m_serverThread
->
join
();
delete
m_serverThread
;
if
(
m_serverThread
!=
NULL
)
{
m_serverThread
->
join
();
delete
m_serverThread
;
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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