mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 16:01:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

move for - if used kill neutrino

Browse Source
This commit is contained in:
Jacek Jendrzej
2018-05-27 14:20:24 +02:00
parent 15572e2d7c
commit 5448b5af3f
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/update.cpp
View File

@@ -702,6 +702,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); restart = ShowMsg(LOCALE_MESSAGEBOX_INFO, LOCALE_FLASHUPDATE_START_SELECTED_PARTITION, CMsgBox::mbrYes, CMsgBox::mbYes | CMsgBox::mbNo, NEUTRINO_ICON_UPDATE);
if (restart == CMsgBox::mbrYes) if (restart == CMsgBox::mbrYes)
{ {
if(g_settings.hdmi_cec_standby){
videoDecoder->SetCECAutoStandby(false);
}
std::string startup_new = "/boot/STARTUP_" + to_string(selected); std::string startup_new = "/boot/STARTUP_" + to_string(selected);
dprintf(DEBUG_NORMAL, "[update] Start selected partition %d (%s)\n", selected, startup_new.c_str()); dprintf(DEBUG_NORMAL, "[update] Start selected partition %d (%s)\n", selected, startup_new.c_str());
#ifndef DRYRUN #ifndef DRYRUN
@@ -724,13 +727,8 @@ int CFlashUpdate::exec(CMenuTarget* parent, const std::string &actionKey)
Neutrino is clearing framebuffer, so ofgwrite's gui is cleared too. Neutrino is clearing framebuffer, so ofgwrite's gui is cleared too.
*/ */
if (restart == CMsgBox::mbrYes){ if (restart == CMsgBox::mbrYes)
if(g_settings.hdmi_cec_standby){
videoDecoder->SetCECAutoStandby(false);
}
CNeutrinoApp::getInstance()->exec(NULL, "reboot"); CNeutrinoApp::getInstance()->exec(NULL, "reboot");
}
#endif #endif
return menu_return::RETURN_EXIT_ALL; return menu_return::RETURN_EXIT_ALL;
} }