From 8e8a7fbd3400ae5882243eda35a19018afb8ac26 Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Wed, 15 Aug 2012 09:47:59 +0400 Subject: [PATCH] Revert "neutrino.cpp:use yes in shutdown message as default" - it breaks inactivity standby This reverts commit 15881f579e809453a8338c90001ad3c618c949fb. Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/721ba0b47f3c28cf1381785e0bfe582a9bfbb086 Author: [CST] Focus Date: 2012-08-15 (Wed, 15 Aug 2012) --- src/neutrino.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 63e6c5b25..b822dac89 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -2728,7 +2728,7 @@ _repeat: if(data) { skipShutdownTimer = (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) { printf("NeutrinoMessages::SLEEPTIMER: skiping\n"); skipShutdownTimer = false; @@ -2774,7 +2774,7 @@ _repeat: } else if( msg == NeutrinoMessages::ANNOUNCE_SHUTDOWN) { 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 ) { if(!skipShutdownTimer) {