1
0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00

Fixed faulty opening of the Recordings menu when pressing the Play key during normal live viewing mode in case there there is a "last viewed" recording

This commit is contained in:
Klaus Schmidinger 2012-12-03 13:27:07 +01:00
parent e2796948b2
commit 780aeab4ff
2 changed files with 5 additions and 3 deletions

View File

@ -7359,3 +7359,5 @@ Video Disk Recorder Revision History
- Simplified calculating the PTS offset in cPtsFixer::Fix() and fixed the overflow - Simplified calculating the PTS offset in cPtsFixer::Fix() and fixed the overflow
handling of PCR values (thanks to Sören Moch). 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 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.

6
vdr.c
View File

@ -22,7 +22,7 @@
* *
* The project's page is at http://www.tvdr.de * 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> #include <getopt.h>
@ -1000,11 +1000,11 @@ int main(int argc, char *argv[])
break; break;
// Direct main menu functions: // Direct main menu functions:
#define DirectMainFunction(function)\ #define DirectMainFunction(function)\
DELETE_MENU;\ { DELETE_MENU;\
if (cControl::Control())\ if (cControl::Control())\
cControl::Control()->Hide();\ cControl::Control()->Hide();\
Menu = new cMenuMain(function);\ 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 kSchedule: DirectMainFunction(osSchedule); break;
case kChannels: DirectMainFunction(osChannels); break; case kChannels: DirectMainFunction(osChannels); break;
case kTimers: DirectMainFunction(osTimers); break; case kTimers: DirectMainFunction(osTimers); break;