Commit 360928e2 authored by d11's avatar d11
Browse files

Change rapidjson include path

parent d44de61e
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment