fzorb/REDACTED-rig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed bugs in CCClient, added missing delete/desttructors for restart

Browse source
This commit is contained in:
BenDroid 2017-10-17 22:31:22 +02:00
parent 5c065a8e48
commit 2b97e2f4ff
17 changed files with 194 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/cc/ControlCommand.cpp
View file

@ -34,7 +34,7 @@ ControlCommand::ControlCommand()
}
ControlCommand::ControlCommand(ControlCommand::Command command)
ControlCommand::ControlCommand(Command command)
: m_command(command)
{
@ -59,7 +59,7 @@ bool ControlCommand::parseFromJson(const rapidjson::Document& document)
if (document.HasMember("control_command")) {
rapidjson::Value::ConstObject controlCommand = document["control_command"].GetObject();
if (controlCommand.HasMember("command")) {
m_command = static_cast<Command>(controlCommand["command"].GetUint());
m_command = toCommand(controlCommand["command"].GetString());
result = true;
}
else {
@ -76,12 +76,12 @@ rapidjson::Value ControlCommand::toJson(rapidjson::MemoryPoolAllocator<rapidjson
{
rapidjson::Value controlCommand(rapidjson::kObjectType);
controlCommand.AddMember("command", m_command, allocator);
controlCommand.AddMember("command", rapidjson::StringRef(toString(m_command)), allocator);
return controlCommand;
}
void ControlCommand::setCommand(ControlCommand::Command command)
void ControlCommand::setCommand(Command command)
{
m_command = command;
}
@ -89,4 +89,11 @@ void ControlCommand::setCommand(ControlCommand::Command command)
ControlCommand::Command ControlCommand::getCommand() const
{
return m_command;
}
}
bool ControlCommand::isOneTimeCommand() const {
return m_command == ControlCommand::UPDATE_CONFIG ||
m_command == ControlCommand::RESTART ||
m_command == ControlCommand::QUIT;
}