From 57ed8ca47868c0a66f2d1d5cd2636b700a1192b9 Mon Sep 17 00:00:00 2001 From: striper Date: Fri, 21 Oct 2011 11:03:11 +0000 Subject: [PATCH] - block FAV button in VirtualZAP mode to prevent unwanted/buggy behavior git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1768 e54a6e83-5905-42d5-8d5c-058d10e6a962 --- src/gui/infoviewer.h | 2 +- src/neutrino.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/infoviewer.h b/src/gui/infoviewer.h index 33ac3b739..a11f0fd85 100644 --- a/src/gui/infoviewer.h +++ b/src/gui/infoviewer.h @@ -97,7 +97,6 @@ class CInfoViewer uint32_t sec_timer_id; uint32_t fadeTimer; - bool virtual_zap_mode; int time_left_width; int time_dot_width; @@ -161,6 +160,7 @@ class CInfoViewer public: bool chanready; bool is_visible; + bool virtual_zap_mode; uint32_t lcdUpdateTimer; CInfoViewer(); diff --git a/src/neutrino.cpp b/src/neutrino.cpp index f725892f6..07c1cfe06 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -2529,7 +2529,7 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data) } /* ================================== KEYS ================================================ */ - if( msg == CRCInput::RC_ok || msg == CRCInput::RC_sat || msg == CRCInput::RC_favorites) { + if( msg == CRCInput::RC_ok || (!g_InfoViewer->virtual_zap_mode && (msg == CRCInput::RC_sat || msg == CRCInput::RC_favorites))) { if( (mode == mode_tv) || (mode == mode_radio) || (mode == mode_ts)) { if(g_settings.mode_clock) InfoClock->StopClock();