From 47609eb2f119d60e184cd7a14ae2b319f563835e Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Mon, 17 Mar 2014 12:28:00 +0400 Subject: [PATCH] neutrino.cpp: remove not reached keys handle, do not pass RC_timeout --- src/neutrino.cpp | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 800f75666..cc0e9158e 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -2284,12 +2284,6 @@ void CNeutrinoApp::RealRun(CMenuWidget &mainMenu) else ShowHint(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_PERSONALIZE_MENUDISABLEDHINT),450, 10); } - else if ((msg == CRCInput::RC_audio) && !g_settings.audio_run_player) - { - StopSubtitles(); - usermenu.showUserMenu(SNeutrinoSettings::BUTTON_GREEN); - StartSubtitles(); - } else if( msg == CRCInput::RC_green) { if (g_settings.personalize[SNeutrinoSettings::P_MAIN_GREEN_BUTTON] == CPersonalizeGui::PERSONALIZE_ACTIVE_MODE_ENABLED) @@ -2311,17 +2305,6 @@ void CNeutrinoApp::RealRun(CMenuWidget &mainMenu) else ShowHint(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_PERSONALIZE_MENUDISABLEDHINT),450, 10); } - else if( (msg == CRCInput::RC_green) || ((msg == CRCInput::RC_audio) && !g_settings.audio_run_player) ) - { - StopSubtitles(); - usermenu.showUserMenu(SNeutrinoSettings::BUTTON_GREEN); - StartSubtitles(); - } - else if( msg == CRCInput::RC_yellow ) { // NVODs - StopSubtitles(); - usermenu.showUserMenu(SNeutrinoSettings::BUTTON_YELLOW); - StartSubtitles(); - } else if( msg == CRCInput::RC_blue ) { if (g_settings.personalize[SNeutrinoSettings::P_MAIN_BLUE_BUTTON] == CPersonalizeGui::PERSONALIZE_ACTIVE_MODE_ENABLED)// Features Menu - Personalization Check { @@ -2332,6 +2315,12 @@ void CNeutrinoApp::RealRun(CMenuWidget &mainMenu) else ShowHint(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_PERSONALIZE_MENUDISABLEDHINT), 450, 10); } + else if ((msg == CRCInput::RC_audio) && !g_settings.audio_run_player) + { + StopSubtitles(); + usermenu.showUserMenu(SNeutrinoSettings::BUTTON_GREEN); + StartSubtitles(); + } else if( (msg == CRCInput::RC_audio) && g_settings.audio_run_player) { //open mediaplayer menu in audio mode, user can select between audioplayer and internetradio CMediaPlayerMenu * media = CMediaPlayerMenu::getInstance(); @@ -2369,7 +2358,8 @@ void CNeutrinoApp::RealRun(CMenuWidget &mainMenu) if (msg == CRCInput::RC_home) { CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO); } - handleMsg(msg, data); + if (msg != CRCInput::RC_timeout) + handleMsg(msg, data); } } else { @@ -2381,7 +2371,8 @@ void CNeutrinoApp::RealRun(CMenuWidget &mainMenu) } } else { - handleMsg(msg, data); + if (msg != CRCInput::RC_timeout) + handleMsg(msg, data); } } }