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 
Conflicts:
	src/gui/audioplayer.cpp
	src/gui/movieplayer.cpp
	src/gui/pictureviewer.cpp
	src/gui/upnpbrowser.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2f3793fa1d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-24 (Thu, 24 Nov 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-11-24 21:45:31 +01:00
parent fb4695897b a85e6a2971
commit 1314c64817
6 changed files with 12 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/pictureviewer.cpp
View File

@@ -202,9 +202,6 @@ int CPictureViewerGui::exec(CMenuTarget* parent, const std::string & actionKey)
// blank background screen
videoDecoder->setBlank(true);
// Stop Sectionsd
//NI g_Sectionsd->setPauseScanning(true);
}
// Save and Clear background
@@ -226,9 +223,6 @@ int CPictureViewerGui::exec(CMenuTarget* parent, const std::string & actionKey)
if (!audioplayer) { // !!! why? !!!
//g_Zapit->unlockPlayBack();
CZapit::getInstance()->EnablePlayback(true);
// Start Sectionsd
//NI g_Sectionsd->setPauseScanning(false);
}
// Restore previous background