From cac4bd8e2802fd20184d89d80b1509dbb9ec09c6 Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Thu, 3 Sep 2020 22:52:52 +0200 Subject: [PATCH] - update-menu: just disable online update if softupdate_url_file doesn't exist Conflicts: src/gui/update_menue.cpp Signed-off-by: Thilo Graf --- src/gui/update_menue.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/gui/update_menue.cpp b/src/gui/update_menue.cpp index ebcee8e9a..fca4bbddd 100644 --- a/src/gui/update_menue.cpp +++ b/src/gui/update_menue.cpp @@ -88,16 +88,15 @@ int CSoftwareUpdate::showSoftwareUpdate() inetkey = CRCInput::convertDigitToKey(1); } -// bool allow_update = !CRecordManager::getInstance()->RecordingStatus() || CRecordManager::getInstance()->TimeshiftOnly(); + bool allow_update = true;//!CRecordManager::getInstance()->RecordingStatus() || CRecordManager::getInstance()->TimeshiftOnly(); CFlashUpdate flash; flash.enableNotify(false); + //online update - if (file_exists(g_settings.softupdate_url_file.c_str())) { - update_item = new CMenuForwarder(LOCALE_FLASHUPDATE_CHECKUPDATE_INTERNET, true, NULL, &flash, "inet", inetkey); - update_item->setHint("", LOCALE_MENU_HINT_SOFTUPDATE_CHECK); - softUpdate.addItem(update_item); - } + update_item = new CMenuForwarder(LOCALE_FLASHUPDATE_CHECKUPDATE_INTERNET, allow_update && file_exists(g_settings.softupdate_url_file.c_str()), NULL, &flash, "inet", inetkey); + update_item->setHint("", LOCALE_MENU_HINT_SOFTUPDATE_CHECK); + softUpdate.addItem(update_item); //local update update_item = new CMenuForwarder(LOCALE_FLASHUPDATE_CHECKUPDATE_LOCAL, true, NULL, &flash, "local", CRCInput::RC_green);