mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-29 16:31:05 +02:00
Merge branch 'check/next-cc'
Compiles on most platforms, starts. Not really tested.
Origin commit data
------------------
Branch: ni/coolstream
Commit: b93a372b54
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-10 (Sun, 10 Nov 2013)
------------------
This commit was generated by Migit
This commit is contained in:
@@ -50,7 +50,7 @@
|
||||
#include <gui/nfs.h>
|
||||
#endif
|
||||
|
||||
#include <gui/components/cc_frm.h>
|
||||
#include <gui/components/cc.h>
|
||||
#include <gui/widget/buttons.h>
|
||||
#include <gui/widget/icons.h>
|
||||
#include <gui/widget/menue.h>
|
||||
@@ -638,8 +638,7 @@ int CPictureViewerGui::show()
|
||||
}
|
||||
hide();
|
||||
|
||||
if (!audioplayer)
|
||||
CAudioMute::getInstance()->enableMuteIcon(true);
|
||||
CAudioMute::getInstance()->enableMuteIcon(true);
|
||||
|
||||
return(res);
|
||||
}
|
||||
|
Reference in New Issue
Block a user