mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-30 00:41:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'check/next-cc'

Browse Source 
needs buildfixing in framebuffer class...

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/fontrenderer.cpp
	src/driver/volume.cpp
	src/gui/audiomute.cpp
	src/gui/audioplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
This commit is contained in:
Stefan Seyfried
2013-05-24 20:24:39 +02:00
parent 95813ab60e 00dd399ff9
commit a7f1e0e25e
50 changed files with 1106 additions and 665 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/pictureviewer.cpp
View File

@@ -44,6 +44,7 @@
#include <driver/fontrenderer.h>
#include <driver/rcinput.h>
#include <gui/audiomute.h>
#include <gui/nfs.h>
#include <gui/widget/buttons.h>
@@ -239,6 +240,8 @@ int CPictureViewerGui::show()
if (audioplayer)
m_currentTitle = m_audioPlayer->getAudioPlayerM_current();
CAudioMute::getInstance()->enableMuteIcon(false);
while (loop)
{
if (update)
@@ -621,6 +624,9 @@ int CPictureViewerGui::show()
}
hide();
if (!audioplayer)
CAudioMute::getInstance()->enableMuteIcon(true);
return(res);
}