From d40aa71aa9ab2944d1e4c811133bd68aa7e91cbe Mon Sep 17 00:00:00 2001 From: Paulchen-Panther Date: Mon, 8 Jul 2019 16:22:28 +0200 Subject: [PATCH] changes in LEDDeviceWrapper::stopDeviceThread() reversed Signed-off-by: Paulchen-Panther --- config/hyperion.config.json.commented | 2 -- libsrc/leddevice/LedDeviceWrapper.cpp | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/config/hyperion.config.json.commented b/config/hyperion.config.json.commented index 3213951d..959c06be 100644 --- a/config/hyperion.config.json.commented +++ b/config/hyperion.config.json.commented @@ -6,12 +6,10 @@ { /// general Settings /// * '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. "general" : { "name" : "MyHyperionConfig", - "versionBranch" : "Stable", "showOptHelp" : true }, /// set log level: silent warn verbose debug diff --git a/libsrc/leddevice/LedDeviceWrapper.cpp b/libsrc/leddevice/LedDeviceWrapper.cpp index c11e6bda..a49700c2 100644 --- a/libsrc/leddevice/LedDeviceWrapper.cpp +++ b/libsrc/leddevice/LedDeviceWrapper.cpp @@ -150,10 +150,10 @@ void LedDeviceWrapper::stopDeviceThread() QThread* oldThread = _ledDevice->thread(); disconnect(oldThread, 0, 0, 0); oldThread->quit(); - oldThread->deleteLater(); - oldThread = nullptr; + oldThread->wait(); + delete oldThread; disconnect(_ledDevice, 0, 0, 0); - _ledDevice->deleteLater(); + delete _ledDevice; _ledDevice = nullptr; }