frodovdr
/
hyperion.ng
mirror of https://github.com/hyperion-project/hyperion.ng.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fix restart of hyperion. now devices closed before restart (#269)

This commit is contained in:
redPanther 2016-10-10 23:08:01 +02:00 committed by GitHub
parent e889996ae7
commit 37558a983f
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/hyperion/Hyperion.h
View File

@ -78,6 +78,10 @@ public:
/// ///
~Hyperion(); ~Hyperion();
///
/// free all alocated objects, should be called only from constructor or before restarting hyperion
///
void freeObjects();
static Hyperion* initInstance(const Json::Value& jsonConfig, const QJsonObject& qjsonConfig, const std::string configFile); static Hyperion* initInstance(const Json::Value& jsonConfig, const QJsonObject& qjsonConfig, const std::string configFile);
static Hyperion* getInstance(); static Hyperion* getInstance();

7
libsrc/hyperion/Hyperion.cpp
View File

@ -594,7 +594,7 @@ Hyperion::Hyperion(const Json::Value &jsonConfig, const QJsonObject &qjsonConfig
} }
Hyperion::~Hyperion() void Hyperion::freeObjects()
{ {
// switch off all leds // switch off all leds
clearall(); clearall();
@ -608,6 +608,11 @@ Hyperion::~Hyperion()
delete _messageForwarder; delete _messageForwarder;
} }
Hyperion::~Hyperion()
{
freeObjects();
}
unsigned Hyperion::getLedCount() const unsigned Hyperion::getLedCount() const
{ {
return _ledString.leds().size(); return _ledString.leds().size();

1
libsrc/jsonserver/JsonClientConnection.cpp
View File

@ -903,6 +903,7 @@ void JsonClientConnection::handleConfigCommand(const QJsonObject& message, const
} }
else if (subcommand == "reload") else if (subcommand == "reload")
{ {
_hyperion->freeObjects();
Process::restartHyperion(); Process::restartHyperion();
sendErrorReply("failed to restart hyperion", full_command, tan); sendErrorReply("failed to restart hyperion", full_command, tan);
} }