mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-12 07:53:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cst-next' into nmp-cst-next

Browse Source 
- Fix merge conflicts


Origin commit data
------------------
Commit: 7a3c90fccf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)
This commit is contained in:
Michael Liebmann
2016-08-19 17:40:48 +02:00
parent 35446879cf 6a997dfeba
commit 4246a31ba6
260 changed files with 8682 additions and 4001 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/audiomute.cpp
View File

@@ -86,7 +86,6 @@ void CAudioMute::AudioMute(int newValue, bool isEvent)
*/
if (!CInfoClock::getInstance()->isBlocked()){
CInfoClock::getInstance()->ClearDisplay();
CInfoClock::getInstance()->paint();//avoids delay
}
frameBuffer->fbNoCheck(true);
@@ -100,7 +99,6 @@ void CAudioMute::AudioMute(int newValue, bool isEvent)
CInfoClock::getInstance()->ClearDisplay();
this->kill();
clearSavedScreen();
CInfoClock::getInstance()->paint();//avoids delay
}else
this->hide();
frameBuffer->setFbArea(CFrameBuffer::FB_PAINTAREA_MUTEICON1);