From f2ea1468a8bee4a2e288f43a5f53a0b89d04927e Mon Sep 17 00:00:00 2001 From: vanhofen Date: Mon, 1 Feb 2016 21:24:54 +0100 Subject: [PATCH] infoviewer: move VZAP-code to right place Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/32d3c2e467cf404cbae982e5ec32dde44272bcab Author: vanhofen Date: 2016-02-01 (Mon, 01 Feb 2016) Origin message was: ------------------ - infoviewer: move VZAP-code to right place --- src/gui/infoviewer.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp index 4fadfbbd5..091c50cf1 100644 --- a/src/gui/infoviewer.cpp +++ b/src/gui/infoviewer.cpp @@ -986,6 +986,10 @@ void CInfoViewer::loop(bool show_dot) g_RCInput->postMsg (msg, data); res = messages_return::cancel_info; + } else if ((g_settings.mode_left_right_key_tv == SNeutrinoSettings::VZAP) && ((msg == CRCInput::RC_right) || (msg == CRCInput::RC_left ))) { + setSwitchMode(IV_MODE_VIRTUAL_ZAP); + res = messages_return::cancel_all; + hideIt = true; } else if (msg == NeutrinoMessages::EVT_TIMESET) { /* handle timeset event in upper layer, ignore here */ res = neutrino->handleMsg (msg, data); @@ -1013,11 +1017,6 @@ void CInfoViewer::loop(bool show_dot) } else res = CNeutrinoApp::getInstance()->handleMsg(msg, data); - - } else if ((g_settings.mode_left_right_key_tv == SNeutrinoSettings::VZAP) && ((msg == CRCInput::RC_right) || (msg == CRCInput::RC_left ))) { - setSwitchMode(IV_MODE_VIRTUAL_ZAP); - res = messages_return::cancel_all; - hideIt = true; } #if 0 else if (CMoviePlayerGui::getInstance().start_timeshift && (msg == NeutrinoMessages::EVT_TIMER)) {