mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-29 08:21:07 +02:00
fix 5b190db (disable CEC standby after flash)
Origin commit data
------------------
Commit: 3c94d8d65d
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2018-05-27 (Sun, 27 May 2018)
This commit is contained in:
@@ -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);
|
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
|
||||||
@@ -726,13 +729,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;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user