summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--HISTORY2
-rw-r--r--vdr.c6
2 files changed, 5 insertions, 3 deletions
diff --git a/HISTORY b/HISTORY
index 9bbabaf3..ddcc48fc 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7359,3 +7359,5 @@ Video Disk Recorder Revision History
- Simplified calculating the PTS offset in cPtsFixer::Fix() and fixed the overflow
handling of PCR values (thanks to Sören Moch).
- Fixed calling iconv_close() only with a valid iconv_t value (thanks to Juergen Lock).
+- Fixed faulty opening of the Recordings menu when pressing the Play key during normal
+ live viewing mode in case there is a "last viewed" recording.
diff --git a/vdr.c b/vdr.c
index 5494cf7d..f3c177fc 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
*
* The project's page is at http://www.tvdr.de
*
- * $Id: vdr.c 2.42 2012/10/13 12:48:56 kls Exp $
+ * $Id: vdr.c 2.43 2012/12/03 13:24:39 kls Exp $
*/
#include <getopt.h>
@@ -1000,11 +1000,11 @@ int main(int argc, char *argv[])
break;
// Direct main menu functions:
#define DirectMainFunction(function)\
- DELETE_MENU;\
+ { DELETE_MENU;\
if (cControl::Control())\
cControl::Control()->Hide();\
Menu = new cMenuMain(function);\
- key = kNone; // nobody else needs to see this key
+ key = kNone; } // nobody else needs to see this key
case kSchedule: DirectMainFunction(osSchedule); break;
case kChannels: DirectMainFunction(osChannels); break;
case kTimers: DirectMainFunction(osTimers); break;