summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2012-10-03 10:18:58 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2012-10-03 10:18:58 +0200
commit90d854c0b4101bbe760b2f1bb86ec004d04d7712 (patch)
tree03e541ac6b05509fefa2b9930416a6f7052b4813
parent1b7a32472ec398f81be6e32648338b3f7e4268fa (diff)
downloadvdr-90d854c0b4101bbe760b2f1bb86ec004d04d7712.tar.gz
vdr-90d854c0b4101bbe760b2f1bb86ec004d04d7712.tar.bz2
Pressing the Blue in the main menu during normal live viewing mode now opens the Recordings menu if there is no "last viewed" recording
-rw-r--r--HISTORY1
-rw-r--r--menu.c6
2 files changed, 4 insertions, 3 deletions
diff --git a/HISTORY b/HISTORY
index 3544f1a8..9af272aa 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7276,3 +7276,4 @@ Video Disk Recorder Revision History
- Pressing the Play key during normal live viewing mode now opens the Recordings menu
if there is no "last viewed" recording (thanks to Alexander Wenzel).
+ The same behavior has been implemented for the Blue key in the main menu.
diff --git a/menu.c b/menu.c
index cdd9d3ac..d50be124 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 2.61 2012/09/15 11:45:28 kls Exp $
+ * $Id: menu.c 2.62 2012/10/03 10:14:53 kls Exp $
*/
#include "menu.h"
@@ -3418,7 +3418,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") : NULL);
+ 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"));
result = true;
}
@@ -3516,7 +3516,7 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
state = replaying ? osContinue : osPause;
break;
case kBlue: if (!HadSubMenu)
- state = replaying ? osStopReplay : cReplayControl::LastReplayed() ? osReplay : osContinue;
+ state = replaying ? osStopReplay : cReplayControl::LastReplayed() ? osReplay : osRecordings;
break;
default: break;
}