Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Origin commit data
------------------
Branch: ni/coolstream
Commit: a57a7dc44b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-25 (Wed, 25 Oct 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-10-25 00:31:24 +02:00

View File

@@ -312,6 +312,9 @@ int CChannelList::doChannelMenu(void)
menu->enableFade(false);
menu->enableSaveScreen(true);
// we don't show introitems, so we add a separator for a smoother view
menu->addItem(GenericMenuSeparator);
//ensure stop info clock before paint context menu
CInfoClock::getInstance()->block();