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

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

Browse Source 
Conflicts:
	src/gui/moviebrowser/mb.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1ddcc0c7ce
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-02 (Wed, 02 Nov 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-11-02 09:50:10 +01:00
parent abfb65680e c21cc27381
commit 6dfe9dc9ba
50 changed files with 5794 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/gui/movieplayer.cpp
View File

@@ -240,6 +240,9 @@ void CMoviePlayerGui::cutNeutrino()
if (isUPNP)
return;
//NI
CZapit::getInstance()->setMoviePlayer(true);// let CCamManager::SetMode know, the call is from MoviePlayer
g_Zapit->lockPlayBack();
//NI if (!isWebTV)
//NI g_Sectionsd->setPauseScanning(true);