From 7251fefa893fc11544a61ba5c393d6774756404c Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sat, 7 Sep 2013 12:52:14 +0200 Subject: The Yellow button in the main menu no longer acts as "Pause" if "Pause key handling" is set to "do not pause live video" --- menu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'menu.c') diff --git a/menu.c b/menu.c index ca1c7e18..6224ef71 100644 --- a/menu.c +++ b/menu.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: menu.c 3.4 2013/09/07 10:03:16 kls Exp $ + * $Id: menu.c 3.5 2013/09/07 12:43:26 kls Exp $ */ #include "menu.h" @@ -3457,7 +3457,7 @@ bool cMenuMain::Update(bool Force) stopReplayItem = NULL; } // Color buttons: - SetHelp(!replaying ? tr("Button$Record") : NULL, tr("Button$Audio"), replaying ? NULL : tr("Button$Pause"), replaying ? tr("Button$Stop") : cReplayControl::LastReplayed() ? tr("Button$Resume") : tr("Button$Play")); + SetHelp(!replaying ? tr("Button$Record") : NULL, tr("Button$Audio"), replaying || !Setup.PauseKeyHandling ? NULL : tr("Button$Pause"), replaying ? tr("Button$Stop") : cReplayControl::LastReplayed() ? tr("Button$Resume") : tr("Button$Play")); result = true; } @@ -3552,7 +3552,7 @@ eOSState cMenuMain::ProcessKey(eKeys Key) } break; case kYellow: if (!HadSubMenu) - state = replaying ? osContinue : osPause; + state = replaying || !Setup.PauseKeyHandling ? osContinue : osPause; break; case kBlue: if (!HadSubMenu) state = replaying ? osStopReplay : cReplayControl::LastReplayed() ? osReplay : osRecordings; -- cgit v1.2.3