From ad6fc49a69def3ea6d43a2832b34e71545a8b84c Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Mon, 12 Apr 2021 23:02:51 +0200 Subject: [PATCH] update_settings.cpp: split statement for update settings notify Avoid double action Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/e553e427a9b0dd609593d4203489a2807c3ad755 Author: Thilo Graf Date: 2021-04-12 (Mon, 12 Apr 2021) ------------------ This commit was generated by Migit --- src/gui/update_settings.cpp | 11 +++++------ src/neutrino.cpp | 1 - 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/gui/update_settings.cpp b/src/gui/update_settings.cpp index d1a3b1005..f250a6fd5 100644 --- a/src/gui/update_settings.cpp +++ b/src/gui/update_settings.cpp @@ -199,20 +199,19 @@ int CUpdateSettings::initMenu() bool CUpdateSettings::changeNotify(const neutrino_locale_t OptionName, void * /* data */) { - if (ARE_LOCALES_EQUAL(OptionName, LOCALE_FLASHUPDATE_AUTOCHECK) || ARE_LOCALES_EQUAL(OptionName, LOCALE_FLASHUPDATE_AUTOCHECK_PACKAGES)) + if (ARE_LOCALES_EQUAL(OptionName, LOCALE_FLASHUPDATE_AUTOCHECK)) { CFlashUpdateCheck::getInstance()->stopThread(); if (g_settings.softupdate_autocheck) CFlashUpdateCheck::getInstance()->startThread(); + } #if ENABLE_PKG_MANAGEMENT - CUpdateCheck::getInstance()->stopTimer(); - if (g_settings.softupdate_autocheck) - CUpdateCheck::getInstance()->startThread(); + if (ARE_LOCALES_EQUAL(OptionName, LOCALE_FLASHUPDATE_AUTOCHECK_PACKAGES)) + { CUpdateCheckPackages::getInstance()->stopTimer(); if (g_settings.softupdate_autocheck_packages) CUpdateCheckPackages::getInstance()->startThread(); -#endif } - +#endif return false; } diff --git a/src/neutrino.cpp b/src/neutrino.cpp index fe0eed0d6..82a6a83df 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -3150,7 +3150,6 @@ TIMER_STOP("################################## after all ####################### delete hintBox; #endif CFlashUpdateCheck::getInstance()->startThread(); - //CUpdateCheck::getInstance()->startThread(); } #if ENABLE_PKG_MANAGEMENT if (g_settings.softupdate_autocheck_packages)