CChannelList::show() call hide only once

Origin commit data
------------------
Branch: ni/coolstream
Commit: 634f2f01b6
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-05-09 (Thu, 09 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2013-05-09 16:32:11 +02:00
committed by [CST] Focus
parent 23de31bb2c
commit 4861e3a1e6

View File

@@ -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);