mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-01 18:01:06 +02:00
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox
Conflicts:
data/icons/hints/hint_backup.png
data/icons/hints/hint_default.png
data/icons/hints/hint_factory.png
data/icons/hints/hint_language.png
data/icons/hints/hint_load.png
data/icons/hints/hint_reset.png
data/icons/hints/hint_restore.png
data/icons/hints/hint_saveas.png
data/icons/hints/hint_ytplay.png
data/icons/status/various/mute.png
Origin commit data
------------------
Commit: 188151d164
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-19 (Tue, 19 Dec 2017)
This commit is contained in:
@@ -98,9 +98,10 @@ void CAudioMute::AudioMute(int newValue, bool isEvent)
|
|||||||
if (!CInfoClock::getInstance()->isBlocked()){
|
if (!CInfoClock::getInstance()->isBlocked()){
|
||||||
CInfoClock::getInstance()->ClearDisplay();
|
CInfoClock::getInstance()->ClearDisplay();
|
||||||
this->kill();
|
this->kill();
|
||||||
clearSavedScreen();
|
}
|
||||||
}else
|
else
|
||||||
this->hide();
|
this->hide();
|
||||||
|
clearSavedScreen();
|
||||||
frameBuffer->setFbArea(CFrameBuffer::FB_PAINTAREA_MUTEICON1);
|
frameBuffer->setFbArea(CFrameBuffer::FB_PAINTAREA_MUTEICON1);
|
||||||
}
|
}
|
||||||
frameBuffer->fbNoCheck(false);
|
frameBuffer->fbNoCheck(false);
|
||||||
|
Reference in New Issue
Block a user