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

Merge branch 'master' into pu/fb-modules

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: ef61905a2d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-08 (Wed, 08 Feb 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2017-02-08 20:16:41 +01:00
parent cb34896b6f b2eb4b1889
commit 7ecb045555
12 changed files with 21 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/screensaver.cpp
View File

@@ -144,10 +144,12 @@ void CScreenSaver::Stop()
m_frameBuffer->paintBackground(); //clear entire screen
CAudioMute::getInstance()->enableMuteIcon(status_mute);
if (!OnAfterStop.empty())
if (!OnAfterStop.empty()){
OnAfterStop();
else
}else{
CInfoClock::getInstance()->ClearDisplay(); //provokes reinit
CInfoClock::getInstance()->enableInfoClock();
}
}
void* CScreenSaver::ScreenSaverPrg(void* arg)