From 0287193bd3757a55e194afe68e2ca845c8ce3395 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 28 Oct 2017 14:18:09 +0200 Subject: [PATCH] fix RC_tv/RC_radio handling; ... if we have separate keys for that we don't need to switch mode Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/1be1a64fcd953ca8535b7e8a166edbf5769297db Author: vanhofen Date: 2017-10-28 (Sat, 28 Oct 2017) Origin message was: ------------------ - fix RC_tv/RC_radio handling; ... if we have separate keys for that we don't need to switch mode ------------------ This commit was generated by Migit --- src/neutrino.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index c27184cb9..6ad0a7cb1 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -2938,7 +2938,18 @@ void CNeutrinoApp::RealRun() StartSubtitles(); } else if (((msg == CRCInput::RC_tv) || (msg == CRCInput::RC_radio)) && (g_settings.key_tvradio_mode == (int)CRCInput::RC_nokey)) { - switchTvRadioMode();//used with defined default tv/radio rc key + if (msg == CRCInput::RC_tv) + { + if (mode == mode_radio) + tvMode(); + } + else if (msg == CRCInput::RC_radio) + { + if (mode == mode_tv || mode == mode_webtv) + radioMode(); + } + else + switchTvRadioMode(); //used with defined default tv/radio rc key } /* in case key_subchannel_up/down redefined */ else if( msg == CRCInput::RC_left || msg == CRCInput::RC_right) {