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

Merge branch 'check/next' into master

Browse Source 
Conflicts:
	data/locale/english.locale
	src/neutrino.cpp
	src/system/setting_helpers.cpp
This commit is contained in:
Stefan Seyfried
2013-03-07 17:10:11 +01:00
parent d2d8218885 3d386649a9
commit 8048673dec
12 changed files with 335 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/audioplayer.cpp
View File

@@ -325,7 +325,7 @@ int CAudioPlayerGui::exec(CMenuTarget* parent, const std::string &actionKey)
puts("[audioplayer.cpp] executing " AUDIOPLAYER_START_SCRIPT ".");
if (my_system(AUDIOPLAYER_START_SCRIPT) != 0)
perror("Datei " AUDIOPLAYER_START_SCRIPT " fehlt.Bitte erstellen, wenn gebraucht.\nFile " AUDIOPLAYER_START_SCRIPT " not found. Please create if needed.\n");
perror(AUDIOPLAYER_START_SCRIPT " failed");
int res = show();
@@ -337,7 +337,7 @@ int CAudioPlayerGui::exec(CMenuTarget* parent, const std::string &actionKey)
puts("[audioplayer.cpp] executing " AUDIOPLAYER_END_SCRIPT ".");
if (my_system(AUDIOPLAYER_END_SCRIPT) != 0)
perror("Datei " AUDIOPLAYER_END_SCRIPT " fehlt. Bitte erstellen, wenn gebraucht.\nFile " AUDIOPLAYER_END_SCRIPT " not found. Please create if needed.\n");
perror(AUDIOPLAYER_END_SCRIPT " failed");
g_Zapit->unlockPlayBack();
// Start Sectionsd
@@ -437,7 +437,7 @@ int CAudioPlayerGui::show()
if (m_screensaver)
{
screensaver(false);
if (msg < CRCInput::RC_MaxRC) {
if (msg <= CRCInput::RC_MaxRC) {
// ignore first keypress - just quit the screensaver
g_RCInput->clearRCMsg();
continue;