From 9e5213fa5c81de8a57ba69c35666a52ac51161bc Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Wed, 14 Dec 2016 22:40:47 +0100 Subject: [PATCH] CNeutrinoApp: simplify shutdown message handling Usage of only one cancel button is more plausible. 'cancel' means cancel this action. And not more! Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/c5f1a03a31536d5182c266a45aa5a4c643d2ff32 Author: Thilo Graf Date: 2016-12-14 (Wed, 14 Dec 2016) ------------------ This commit was generated by Migit --- src/neutrino.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 8f185ce20..d852de5e1 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -3276,9 +3276,9 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data) } else if( msg == NeutrinoMessages::SLEEPTIMER) { if(data) {//INACTIVITY SLEEPTIMER - skipShutdownTimer = - (ShowMsg(LOCALE_MESSAGEBOX_INFO, g_settings.shutdown_real ? LOCALE_SHUTDOWNTIMER_ANNOUNCE:LOCALE_SLEEPTIMERBOX_ANNOUNCE, - CMsgBox::mbrNo, CMsgBox::mbYes | CMsgBox::mbNo, NULL, 450, 30, true) == CMsgBox::mbrYes);//FIXME + int msgbox = ShowMsg(LOCALE_MESSAGEBOX_INFO, g_settings.shutdown_real ? LOCALE_SHUTDOWNTIMER_ANNOUNCE:LOCALE_SLEEPTIMERBOX_ANNOUNCE, + CMsgBox::mbrCancel, CMsgBox::mbCancel, NULL, 450, 60); + skipShutdownTimer = !(msgbox & CMsgBox::mbrTimeout); if(skipShutdownTimer) { printf("NeutrinoMessages::INACTIVITY SLEEPTIMER: skiping\n"); skipShutdownTimer = false;