mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-09 14:48:28 +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
------------------
Commit: 2f3793fa1d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-24 (Thu, 24 Nov 2016)
This commit is contained in:
vanhofen
2016-11-24 21:45:31 +01:00
parent a2f404e939 cf6c9b99d9
commit 56879044cb
6 changed files with 12 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/upnpbrowser.cpp
View File

@@ -187,9 +187,6 @@ int CUpnpBrowserGui::exec(CMenuTarget* parent, const std::string & /*actionKey*/
// remember last mode
m_LastMode=(CNeutrinoApp::getInstance()->getLastMode());
// Stop sectionsd
//NI g_Sectionsd->setPauseScanning(true);
m_deviceliststart=0;
m_selecteddevice=0;
timeout = 0;
@@ -198,8 +195,6 @@ int CUpnpBrowserGui::exec(CMenuTarget* parent, const std::string & /*actionKey*/
stopAudio();
// Start Sectionsd
//NI g_Sectionsd->setPauseScanning(false);
m_frameBuffer->stopFrame();
m_frameBuffer->Clear();