frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2023-10-10 13:36:59 +02:00
Code Issues Releases Wiki Activity

changes in LEDDeviceWrapper::stopDeviceThread() reversed

Browse Source 
Signed-off-by: Paulchen-Panther <Paulchen-Panter@protonmail.com>
This commit is contained in:
Paulchen-Panther 2019-07-08 16:22:28 +02:00
parent e6c2e7ebf9
commit d40aa71aa9
No known key found for this signature in database
GPG Key ID: 84E3B692456B6840
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/hyperion.config.json.commented
View File

@ -6,12 +6,10 @@
{ {
/// general Settings /// general Settings
/// * 'name' : The user friendly name of the hyperion instance (used for network things) /// * 'name' : The user friendly name of the hyperion instance (used for network things)
/// * 'versionBranch' : Which branch should be used for hyperion version
/// * 'showOptHelp' : Show option expanations at the webui. Highly recommended for beginners. /// * 'showOptHelp' : Show option expanations at the webui. Highly recommended for beginners.
"general" : "general" :
{ {
"name" : "MyHyperionConfig", "name" : "MyHyperionConfig",
"versionBranch" : "Stable",
"showOptHelp" : true "showOptHelp" : true
}, },
/// set log level: silent warn verbose debug /// set log level: silent warn verbose debug

6
libsrc/leddevice/LedDeviceWrapper.cpp
View File

@ -150,10 +150,10 @@ void LedDeviceWrapper::stopDeviceThread()
QThread* oldThread = _ledDevice->thread(); QThread* oldThread = _ledDevice->thread();
disconnect(oldThread, 0, 0, 0); disconnect(oldThread, 0, 0, 0);
oldThread->quit(); oldThread->quit();
oldThread->deleteLater(); oldThread->wait();
oldThread = nullptr; delete oldThread;
disconnect(_ledDevice, 0, 0, 0); disconnect(_ledDevice, 0, 0, 0);
_ledDevice->deleteLater(); delete _ledDevice;
_ledDevice = nullptr; _ledDevice = nullptr;
} }