From fa3e02ce6c2514e8a554ce5f7f35b27ab8f52f86 Mon Sep 17 00:00:00 2001 From: Michael Liebmann Date: Wed, 11 Dec 2013 13:10:27 +0100 Subject: [PATCH] CInfoClock: Remove clock off via exit button Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/bc1b94deb93c93332bb73fdf0e174e5c0fbd7bd5 Author: Michael Liebmann Date: 2013-12-11 (Wed, 11 Dec 2013) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/neutrino.cpp | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index a88f3ad7f..fe940095c 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -2171,12 +2171,9 @@ void CNeutrinoApp::RealRun(CMenuWidget &mainMenu) } else if( msg == (neutrino_msg_t) g_settings.key_zaphistory ) { // Zap-History "Bouquet" - if(g_settings.mode_clock && g_settings.key_zaphistory == CRCInput::RC_home) { - InfoClock->enableInfoClock(false); - g_settings.mode_clock = false; - } else { - numericZap( msg ); - } + InfoClock->enableInfoClock(false); + numericZap( msg ); + InfoClock->enableInfoClock(true); } else if (msg == (neutrino_msg_t) g_settings.key_screenshot) { for(int i = 0; i < g_settings.screenshot_count; i++) { @@ -2333,10 +2330,6 @@ void CNeutrinoApp::RealRun(CMenuWidget &mainMenu) } else { if (msg == CRCInput::RC_home) { - if(g_settings.mode_clock && g_settings.key_zaphistory == CRCInput::RC_home) { - InfoClock->enableInfoClock(false); - g_settings.mode_clock = false; - } CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO); } handleMsg(msg, data);