frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/hyperion-project/master' into weba

Browse Source
This commit is contained in:
brindosch
2017-01-24 21:30:00 +01:00
parent d5d750db60 ed47852518
commit 0578cda79a
16 changed files with 350 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libsrc/jsonserver/JsonClientConnection.cpp
View File

@@ -892,7 +892,7 @@ void JsonClientConnection::handleConfigCommand(const QJsonObject& message, const
}
else if (subcommand == "reload")
{
_hyperion->freeObjects();
_hyperion->freeObjects(true);
Process::restartHyperion();
sendErrorReply("failed to restart hyperion", full_command, tan);
}
@@ -912,7 +912,7 @@ void JsonClientConnection::handleConfigGetCommand(const QJsonObject& message, co
try
{
result["result"] = QJsonFactory::readJson(QString::fromStdString(_hyperion->getConfigFileName()));
result["result"] = QJsonFactory::readConfig(QString::fromStdString(_hyperion->getConfigFileName()));
}
catch(...)
{