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
360928e2
Commit
360928e2
authored
Mar 10, 2020
by
d11
Browse files
Change rapidjson include path
parent
d44de61e
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/controllers/remotenanokin/RemoteNanokin.cpp
View file @
360928e2
...
...
@@ -21,8 +21,8 @@
#include <iostream>
#include <common/base/ServerProperties.h>
#include "controllers/common/family/Families.h"
#include "
contrib/
rapidjson/stringbuffer.h"
#include "
contrib/
rapidjson/prettywriter.h"
#include "rapidjson/stringbuffer.h"
#include "rapidjson/prettywriter.h"
namespace
nanokin
{
...
...
@@ -129,11 +129,12 @@ void RemoteNanokin::start() {
m_StopApplication
=
m_server
->
start
(
NANOKIN_STOP_CMD
);
m_StartApplication
->
waitFor
(
application
::
STOPPED
);
if
(
m_StartOutputSocket
)
{
m_StartOutputSocket
->
cancel
();
if
(
m_StartApplication
)
{
m_StartApplication
->
waitFor
(
application
::
STOPPED
);
if
(
m_StartOutputSocket
)
{
m_StartOutputSocket
->
cancel
();
}
}
}
catch
(
const
std
::
exception
&
e
)
{
// Currently an exception can occur during isAvailable.
cout
<<
"Unexpected exception during nanokin cameo connection: "
<<
e
.
what
()
<<
endl
;
...
...
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