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

Revert "neutrino.cpp:use yes in shutdown message as default" - it breaks inactivity standby

Browse Source 
This reverts commit af74eb4f7e.
This commit is contained in:
[CST] Focus
2012-08-15 09:47:59 +04:00
parent 34f4050edb
commit 721ba0b47f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/neutrino.cpp
View File

@@ -2728,7 +2728,7 @@ _repeat:
if(data) { if(data) {
skipShutdownTimer = skipShutdownTimer =
(ShowLocalizedMessage(LOCALE_MESSAGEBOX_INFO, LOCALE_SHUTDOWNTIMER_ANNOUNCE, (ShowLocalizedMessage(LOCALE_MESSAGEBOX_INFO, LOCALE_SHUTDOWNTIMER_ANNOUNCE,
CMessageBox::mbrYes, CMessageBox::mbYes | CMessageBox::mbNo, NULL, 450, 30, true) == CMessageBox::mbrYes);//FIXME CMessageBox::mbrNo, CMessageBox::mbYes | CMessageBox::mbNo, NULL, 450, 30, true) == CMessageBox::mbrYes);//FIXME
if(skipShutdownTimer) { if(skipShutdownTimer) {
printf("NeutrinoMessages::SLEEPTIMER: skiping\n"); printf("NeutrinoMessages::SLEEPTIMER: skiping\n");
skipShutdownTimer = false; skipShutdownTimer = false;
@@ -2774,7 +2774,7 @@ _repeat:
} }
else if( msg == NeutrinoMessages::ANNOUNCE_SHUTDOWN) { else if( msg == NeutrinoMessages::ANNOUNCE_SHUTDOWN) {
if( mode != mode_scart ) if( mode != mode_scart )
skipShutdownTimer = (ShowLocalizedMessage(LOCALE_MESSAGEBOX_INFO, LOCALE_SHUTDOWNTIMER_ANNOUNCE, CMessageBox::mbrYes, CMessageBox::mbYes | CMessageBox::mbNo, NULL, 450, 5) == CMessageBox::mbrYes); skipShutdownTimer = (ShowLocalizedMessage(LOCALE_MESSAGEBOX_INFO, LOCALE_SHUTDOWNTIMER_ANNOUNCE, CMessageBox::mbrNo, CMessageBox::mbYes | CMessageBox::mbNo, NULL, 450, 5) == CMessageBox::mbrYes);
} }
else if( msg == NeutrinoMessages::SHUTDOWN ) { else if( msg == NeutrinoMessages::SHUTDOWN ) {
if(!skipShutdownTimer) { if(!skipShutdownTimer) {