frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed an inconsistent behavior between opening the Recordings menu manually via the main menu and by pressing the Recordings key

This commit is contained in:
Klaus Schmidinger 2013-10-16 09:49:26 +02:00
parent cb1498a609
commit fb74e0feeb
5 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTORS
View File

@ -618,6 +618,8 @@ Helmut Auer <vdr@helmutauer.de>
for suggesting to read the epg.data file in a separate thread
for some improvements to allowing the parameters PATH and NAME to the --dirnames
command line option to be left empty to use the default values if only ENC shall be set
for reporting an inconsistent behavior between opening the Recordings menu manually
via the main menu and by pressing the Recordings key
Jeremy Hall <jhall@UU.NET>
for fixing an incomplete initialization of the filter parameters in eit.c

8
HISTORY
View File

@ -7832,7 +7832,7 @@ Video Disk Recorder Revision History
- Fixed cleaning up old EPG events in case no epg data file is given (reported by
Dave Pickles).
2013-10-13: Version 2.0.4
2013-10-16: Version 2.0.4
- Unified the internal sequence of actions when pressing the Blue and the Back key,
respectively, during replay (reported by Thomas Maass).
@ -7849,3 +7849,9 @@ Video Disk Recorder Revision History
while a recording is active (reported by Torsten Lang).
- Added maximum signal strength value for TechniSat SkyStar 2 DVB-S rev 2.3P (thanks
to Guido Cordaro).
- Fixed an inconsistent behavior between opening the Recordings menu manually via the
main menu and by pressing the Recordings key. In the latter case it automatically
opened all sub folders to position the cursor to the last replayed recording, which
is unexpected at this point (reported by Helmut Auer). You can still navigate to
the last replayed recording (if any) by pressing Ok repeatedly in the Recordings
menu.

6
menu.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: menu.c 2.82.1.4 2013/09/07 12:53:34 kls Exp $
* $Id: menu.c 2.82.1.5 2013/10/16 09:46:24 kls Exp $
*/
#include "menu.h"
@ -3364,7 +3364,7 @@ cMenuPluginItem::cMenuPluginItem(const char *Name, int Index)
cOsdObject *cMenuMain::pluginOsdObject = NULL;
cMenuMain::cMenuMain(eOSState State)
cMenuMain::cMenuMain(eOSState State, bool OpenSubMenus)
:cOsdMenu("")
{
SetMenuCategory(mcMain);
@ -3381,7 +3381,7 @@ cMenuMain::cMenuMain(eOSState State)
case osSchedule: AddSubMenu(new cMenuSchedule); break;
case osChannels: AddSubMenu(new cMenuChannels); break;
case osTimers: AddSubMenu(new cMenuTimers); break;
case osRecordings: AddSubMenu(new cMenuRecordings(NULL, 0, true)); break;
case osRecordings: AddSubMenu(new cMenuRecordings(NULL, 0, OpenSubMenus)); break;
case osSetup: AddSubMenu(new cMenuSetup); break;
case osCommands: AddSubMenu(new cMenuCommands(tr("Commands"), &Commands)); break;
default: break;

4
menu.h
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: menu.h 2.13 2012/12/07 13:44:13 kls Exp $
* $Id: menu.h 2.13.1.1 2013/10/16 09:46:15 kls Exp $
*/
#ifndef __MENU_H
@ -107,7 +107,7 @@ private:
void Set(void);
bool Update(bool Force = false);
public:
cMenuMain(eOSState State = osUnknown);
cMenuMain(eOSState State = osUnknown, bool OpenSubMenus = false);
virtual eOSState ProcessKey(eKeys Key);
static cOsdObject *PluginOsdObject(void);
};

4
vdr.c
View File

@ -22,7 +22,7 @@
*
* The project's page is at http://www.tvdr.de
*
* $Id: vdr.c 2.57 2013/03/15 10:44:54 kls Exp $
* $Id: vdr.c 2.57.1.1 2013/10/16 09:46:36 kls Exp $
*/
#include <getopt.h>
@ -1234,7 +1234,7 @@ int main(int argc, char *argv[])
case osRecordings:
DELETE_MENU;
cControl::Shutdown();
Menu = new cMenuMain(osRecordings);
Menu = new cMenuMain(osRecordings, true);
break;
case osReplay: DELETE_MENU;
cControl::Shutdown();