From 4b784cf6edff9e41447c5f397dff35f19a8194e9 Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Wed, 9 Mar 2016 10:53:15 +0300 Subject: [PATCH] neutrino.cpp: try to fix sat/fav keys handling after calling zap history Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/9e3b1c58443b7d1e1aa41466dbda59d48a63956f Author: [CST] Focus Date: 2016-03-09 (Wed, 09 Mar 2016) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/channellist.cpp | 2 ++ src/neutrino.cpp | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index 17655dc91..e8a11f3e7 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -1278,6 +1278,7 @@ int CChannelList::numericZap(int key) bool showEPG = false; neutrino_msg_t msg; neutrino_msg_data_t data; + g_InfoViewer->setSwitchMode(CInfoViewer::IV_MODE_NUMBER_ZAP); while(1) { if (lastchan != chn) { @@ -1361,6 +1362,7 @@ int CChannelList::numericZap(int key) if (chan && showEPG) g_EventList->exec(chan->getChannelID(), chan->getName()); } + g_InfoViewer->resetSwitchMode(); return res; } diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 451f340e2..fa7d9f0c0 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -2179,7 +2179,6 @@ void CNeutrinoApp::quickZap(int msg) void CNeutrinoApp::numericZap(int msg) { StopSubtitles(); - g_InfoViewer->setSwitchMode(CInfoViewer::IV_MODE_NUMBER_ZAP); int res = channelList->numericZap( msg ); StartSubtitles(res < 0); if (res >= 0 && CRCInput::isNumeric(msg)) {