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

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox

Browse Source 
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
------------------
Branch: ni/coolstream
Commit: 188151d164
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-19 (Tue, 19 Dec 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-12-19 20:42:53 +01:00
parent 32e2a33ce2 fbdbfc2bd5
commit 953fe8b9e7
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/audiomute.cpp
View File

@@ -98,9 +98,10 @@ void CAudioMute::AudioMute(int newValue, bool isEvent)
if (!CInfoClock::getInstance()->isBlocked()){
CInfoClock::getInstance()->ClearDisplay();
this->kill();
clearSavedScreen();
}else
}
else
this->hide();
clearSavedScreen();
frameBuffer->setFbArea(CFrameBuffer::FB_PAINTAREA_MUTEICON1);
}
frameBuffer->fbNoCheck(false);