Merge remote-tracking branch 'uncool/cst-next'

Origin commit data
------------------
Branch: ni/coolstream
Commit: b837d8697b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-28 (Mon, 28 Dec 2015)


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

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2015-12-28 16:15:14 +01:00
122 changed files with 5543 additions and 2589 deletions

View File

@@ -1347,7 +1347,7 @@ bool CFrameBuffer::_checkFbArea(int _x, int _y, int _dx, int _dy, bool prev)
break;
fb_no_check = true;
if (prev)
CAudioMute::getInstance()->hide(true);
CAudioMute::getInstance()->hide();
else
CAudioMute::getInstance()->paint();
fb_no_check = false;