Merge branch 'master' into pu/fb-modules

This commit is contained in:
M. Liebmann
2017-02-08 20:16:41 +01:00
12 changed files with 21 additions and 52 deletions

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)