From 1099d0f0f234c93e734bfd73feea72fcd9069ce0 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Thu, 28 Jan 2016 09:42:51 +0100 Subject: [PATCH 1/2] neutrino: fix lastMode when switching to mode_upnp Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/93413dad3e54bbb6b785fbc23db6a383f80e7b55 Author: vanhofen Date: 2016-01-28 (Thu, 28 Jan 2016) Origin message was: ------------------ - neutrino: fix lastMode when switching to mode_upnp --- src/neutrino.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index d3cf456ff..9e3308fa9 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -3255,6 +3255,10 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data) if(mode != mode_standby) standbyMode( true ); } + if((data & mode_mask)== mode_upnp) { + lastMode=mode; + mode=mode_upnp; + } if((data & mode_mask)== mode_audio) { lastMode=mode; mode=mode_audio; From d9f2427b3c7e3ccc9643c46695b3aff5880aa49a Mon Sep 17 00:00:00 2001 From: vanhofen Date: Thu, 28 Jan 2016 09:50:52 +0100 Subject: [PATCH 2/2] neutrino: initialize lastMode; just for safety Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/bb11139eb4247c0d96e0529ddc43652d4fdce850 Author: vanhofen Date: 2016-01-28 (Thu, 28 Jan 2016) Origin message was: ------------------ - neutrino: initialize lastMode; just for safety --- src/neutrino.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 9e3308fa9..16c069594 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -224,6 +224,7 @@ CNeutrinoApp::CNeutrinoApp() SetupFrameBuffer(); mode = mode_unknown; + lastMode = mode_unknown; channelList = NULL; TVchannelList = NULL; RADIOchannelList = NULL; @@ -1748,6 +1749,7 @@ void CNeutrinoApp::InitZapper() int tvmode = CZapit::getInstance()->getMode() & CZapitClient::MODE_TV; lastChannelMode = tvmode ? g_settings.channel_mode : g_settings.channel_mode_radio; mode = tvmode ? mode_tv : mode_radio; + lastMode = mode; SDTreloadChannels = false; channelsInit();