mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 18:31:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	lib/libdvbsub/dvbsubtitle.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/neutrinoyparser.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 69d8616a91
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-12 (Sun, 12 Mar 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-03-12 22:03:03 +01:00
parent aa805890c7 c3245e8661
commit ca99393430
32 changed files with 593 additions and 317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/bouquetlist.cpp
View File

@@ -2,7 +2,7 @@
Neutrino-GUI - DBoxII-Project
Copyright (C) 2001 Steffen Hehn 'McClean'
Copyright (C) 2009,2011,2013,2015-2016 Stefan Seyfried
Copyright (C) 2009,2011,2013,2015-2017 Stefan Seyfried
License: GPL
@@ -584,7 +584,7 @@ int CBouquetList::show(bool bShowChannelList)
g_RCInput->postMsg(msg, data);
loop = false;
res = CHANLIST_CANCEL_ALL;
} else if (msg > CRCInput::RC_MaxRC) {
} else {
if ( CNeutrinoApp::getInstance()->handleMsg( msg, data ) & messages_return::cancel_all ) {
loop = false;
res = CHANLIST_CANCEL_ALL;