From 36f906afc09d31d3bf6bb77f16fa15543e4e3e1f Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Wed, 24 Feb 2010 13:40:20 +0000 Subject: [PATCH] fix rc favorites git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@405 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/24c8d684c9fd1c019f85f8994684fcd8bc12fbba Author: Jacek Jendrzej Date: 2010-02-24 (Wed, 24 Feb 2010) ------------------ This commit was generated by Migit --- src/gui/epgplus.cpp | 13 +++++++------ src/gui/filebrowser.cpp | 3 +++ src/gui/movieplayer.cpp | 3 +++ 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/gui/epgplus.cpp b/src/gui/epgplus.cpp index 67c625673..9ec23dab8 100644 --- a/src/gui/epgplus.cpp +++ b/src/gui/epgplus.cpp @@ -1081,12 +1081,13 @@ int EpgPlus::exec (CChannelList * pchannelList, int selectedChannelIndex, CBouqu } } } - else if (msg == CRCInput::RC_sat || msg == CRCInput::RC_favorites) { - g_RCInput->postMsg (msg, 0); - res = menu_return::RETURN_EXIT_ALL; - loop = false; - } - } else { + } + else if (msg == CRCInput::RC_sat || msg == CRCInput::RC_favorites) { + g_RCInput->postMsg (msg, 0); + res = menu_return::RETURN_EXIT_ALL; + loop = false; + } + else { if (CNeutrinoApp::getInstance ()->handleMsg (msg, data) & messages_return::cancel_all) { loop = false; res = menu_return::RETURN_EXIT_ALL; diff --git a/src/gui/filebrowser.cpp b/src/gui/filebrowser.cpp index 9924a9941..c8665e50e 100644 --- a/src/gui/filebrowser.cpp +++ b/src/gui/filebrowser.cpp @@ -1096,6 +1096,9 @@ bool CFileBrowser::exec(const char * const dirname) if (!(filelist.empty())) SMSInput(msg_repeatok); } + else if (msg == CRCInput::RC_sat || msg == CRCInput::RC_favorites) { + //FIXME do nothing ? + } else { if ( CNeutrinoApp::getInstance()->handleMsg( msg, data ) & messages_return::cancel_all ) diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp index 583bba8ca..ec7b077ab 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -1213,6 +1213,9 @@ void CMoviePlayerGui::PlayFile(void) } } #endif + else if (msg == CRCInput::RC_sat || msg == CRCInput::RC_favorites) { + //FIXME do nothing ? + } else if (msg == CRCInput::RC_timeout) { // nothing } else if ((msg == NeutrinoMessages::ANNOUNCE_RECORD) || msg == NeutrinoMessages::RECORD_START || msg == NeutrinoMessages::ZAPTO || msg == NeutrinoMessages::STANDBY_ON || msg == NeutrinoMessages::SHUTDOWN || msg == NeutrinoMessages::SLEEPTIMER) { // Exit for Record/Zapto Timers