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 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 87fe81b890
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-02 (Fri, 02 Dec 2016)


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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-12-02 23:39:21 +01:00
parent b90ff0ddf1 243909caf8
commit e30d9b012a
41 changed files with 345 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/pictureviewer.cpp
View File

@@ -203,9 +203,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
@@ -227,9 +224,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