From 6d03cb9e50ee13a9b76c363ecddb41627eceb511 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Tue, 17 May 2016 09:46:10 +0200 Subject: [PATCH] Revert "very bad idea src/gui/channellist.cpp fix current channel after edit mode" This reverts commit f37b72a4324d7a3e283213b43db2b600565c183c. Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/0b07edaffe388ae1360ee1dc54b2149d344aea6c Author: Jacek Jendrzej Date: 2016-05-17 (Tue, 17 May 2016) ------------------ This commit was generated by Migit --- src/gui/channellist.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index 8129e6488..0ac572d00 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -1185,8 +1185,7 @@ void CChannelList::zapToChannel(CZapitChannel *channel, bool force) selected_chid = channel->getChannelID(); g_RemoteControl->zapTo_ChannelID(selected_chid, channel->getName(), channel->number, (channel->Locked() == g_settings.parentallock_defaultlocked)); - if(CNeutrinoApp::getInstance()->adjustToChannelID(channel->getChannelID())) - CZapit::getInstance()->SetCurrentChannelID(channel->getChannelID()); + CNeutrinoApp::getInstance()->adjustToChannelID(channel->getChannelID()); } if(new_zap_mode != 2 /* not active */) { /* remove recordModeActive from infobar */