From 446e2370798649bd4035bda567d59e7375734d2e Mon Sep 17 00:00:00 2001 From: GetAway Date: Sun, 2 Oct 2022 21:58:43 +0200 Subject: [PATCH] neutrino.cpp: suppress inactivity popup in standby mode Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/7dcc266084518903805f93b53e69a27e4be1f2ba Author: GetAway Date: 2022-10-02 (Sun, 02 Oct 2022) Origin message was: ------------------ - neutrino.cpp: suppress inactivity popup in standby mode ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/neutrino.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 28559cff0..75930b588 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -4431,18 +4431,22 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data) return messages_return::handled; } else if( msg == NeutrinoMessages::SLEEPTIMER) { - if(data) {//INACTIVITY SLEEPTIMER + if( data && mode == NeutrinoModes::mode_standby ) { //SKIP INACTIVITY SLEEPTIMER + printf("NeutrinoMessages::INACTIVITY SLEEPTIMER: skipping, already in standby mode\n"); + return messages_return::handled; + } + else if(data) {//INACTIVITY SLEEPTIMER 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"); + printf("NeutrinoMessages::INACTIVITY SLEEPTIMER: skipping\n"); skipShutdownTimer = false; return messages_return::handled; } }else{ //MAIN-MENU SLEEPTIMER if(skipSleepTimer) { - printf("NeutrinoMessages::SLEEPTIMER: skiping\n"); + printf("NeutrinoMessages::SLEEPTIMER: skipping\n"); skipSleepTimer = false; return messages_return::handled; }