Merge branch 'check/next-cc'

Compiles on most platforms, starts. Not really tested.
This commit is contained in:
Stefan Seyfried
2013-11-10 16:55:53 +01:00
114 changed files with 7292 additions and 1585 deletions

View File

@@ -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);
}