From f727b9b8fe6fa208a0e6cf6b0a8d00d41aabfc4a Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Sun, 27 May 2018 23:29:39 +0200 Subject: [PATCH] fix 5b190db (disable CEC standby after flash) Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/3c94d8d65d2d80fcd70ac31ce31d5b25b4f9ef0d Author: Jacek Jendrzej Date: 2018-05-27 (Sun, 27 May 2018) --- src/gui/update.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/gui/update.cpp b/src/gui/update.cpp index 485cc8a26..06b7b138c 100644 --- a/src/gui/update.cpp +++ b/src/gui/update.cpp @@ -704,6 +704,9 @@ int CFlashUpdate::exec(CMenuTarget* parent, const std::string &actionKey) restart = ShowMsg(LOCALE_MESSAGEBOX_INFO, LOCALE_FLASHUPDATE_START_SELECTED_PARTITION, CMsgBox::mbrYes, CMsgBox::mbYes | CMsgBox::mbNo, NEUTRINO_ICON_UPDATE); if (restart == CMsgBox::mbrYes) { + if(g_settings.hdmi_cec_standby){ + videoDecoder->SetCECAutoStandby(false); + } std::string startup_new = "/boot/STARTUP_" + to_string(selected); dprintf(DEBUG_NORMAL, "[update] Start selected partition %d (%s)\n", selected, startup_new.c_str()); #ifndef DRYRUN @@ -726,13 +729,8 @@ int CFlashUpdate::exec(CMenuTarget* parent, const std::string &actionKey) Neutrino is clearing framebuffer, so ofgwrite's gui is cleared too. */ - if (restart == CMsgBox::mbrYes){ - if(g_settings.hdmi_cec_standby){ - videoDecoder->SetCECAutoStandby(false); - } - + if (restart == CMsgBox::mbrYes) CNeutrinoApp::getInstance()->exec(NULL, "reboot"); - } #endif return menu_return::RETURN_EXIT_ALL; }