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

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: ec448e14fe
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-23 (Sun, 23 Oct 2016)


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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-10-23 21:57:00 +02:00
parent 91d5fbb914 c2c06e0d86
commit 06167cc8d0
26 changed files with 139 additions and 633 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/channellist.cpp
View File

@@ -1095,10 +1095,12 @@ bool CChannelList::checkLockStatus(neutrino_msg_data_t data, bool pip)
out:
if (startvideo) {
if(pip) {
#ifdef ENABLE_PIP
if (CNeutrinoApp::getInstance()->StartPip((*chanlist)[selected]->getChannelID())) {
calcSize();
paintBody();
}
#endif
} else
g_RemoteControl->startvideo();
return true;