From 4861e3a1e65cbc06a83f87ba7997dbfc03f12a30 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Thu, 9 May 2013 16:32:11 +0200 Subject: [PATCH] CChannelList::show() call hide only once Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/634f2f01b69a59eb630dbe8743d34562651e6c18 Author: Jacek Jendrzej Date: 2013-05-09 (Thu, 09 May 2013) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/channellist.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index 483b6eb38..75ac32630 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -595,6 +595,7 @@ int CChannelList::show() bool bouquet_changed = false; bool loop=true; + bool dont_hide = false; while (loop) { g_RCInput->getMsgAbsoluteTimeout(&msg, &data, &timeoutEnd, true); if ( msg <= CRCInput::RC_MaxRC ) @@ -762,6 +763,7 @@ int CChannelList::show() res = bouquetList->showChannelList(); loop = false; } + dont_hide = true; } } else if ( msg == CRCInput::RC_ok ) { @@ -919,10 +921,10 @@ int CChannelList::show() if (bouquet_changed) res = -5; /* in neutrino.cpp: -5 == "don't change bouquet after adding a channel to fav" */ - - hide(); - - fader.Stop(); + if(!dont_hide){ + hide(); + fader.Stop(); + } if (bShowBouquetList) { res = bouquetList->exec(true);