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

Merge remote-tracking branch 'test/cst-next'

Browse Source 
Conflicts:
	src/gui/osdlang_setup.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 48fdfc5e5e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-19 (Thu, 19 Feb 2015)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2015-02-19 14:10:26 +01:00
parent a51c9d1e6a 3731854ff0
commit e4e9fb1e46
23 changed files with 86 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/driver/scanepg.cpp
View File

@@ -337,8 +337,10 @@ void CEpgScan::EnterStandby()
void CEpgScan::Next()
{
bool llocked = false, plocked = false;
bool llocked = false;
#ifdef ENABLE_PIP
bool plocked = false;
#endif
next_chid = 0;
if (!standby && CNeutrinoApp::getInstance()->getMode() == NeutrinoMessages::mode_standby)