summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2013-10-16 09:43:47 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2013-10-16 09:43:47 +0200
commitc9fb7eb4d6785ce6bbe88e1e45e4f5309c9ad889 (patch)
treef30d9c1edff660bcdde346e884c579518e2e4a90
parent38703228882377474c01bf3c13804f65339cb7e1 (diff)
downloadvdr-c9fb7eb4d6785ce6bbe88e1e45e4f5309c9ad889.tar.gz
vdr-c9fb7eb4d6785ce6bbe88e1e45e4f5309c9ad889.tar.bz2
Fixed an inconsistent behavior between opening the Recordings menu manually via the main menu and by pressing the Recordings key
-rw-r--r--CONTRIBUTORS2
-rw-r--r--HISTORY8
-rw-r--r--menu.c6
-rw-r--r--menu.h4
-rw-r--r--vdr.c4
5 files changed, 16 insertions, 8 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 4a8a46fb..3c31e1cc 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -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
diff --git a/HISTORY b/HISTORY
index 2b342eee..4d337e26 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7920,7 +7920,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.1.2
+2013-10-14: Version 2.1.2
- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
- Fixed displaying DVB subtitles (thanks to Rolf Ahrenberg for helping to debug and
@@ -8003,3 +8003,9 @@ Video Disk Recorder Revision History
value in case there are many radio recordings in the video directory.
- 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.
diff --git a/menu.c b/menu.c
index ae962f77..df78513c 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.9 2013/10/14 10:28:10 kls Exp $
+ * $Id: menu.c 3.10 2013/10/16 09:15:36 kls Exp $
*/
#include "menu.h"
@@ -3732,7 +3732,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);
@@ -3749,7 +3749,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;
diff --git a/menu.h b/menu.h
index 03e91715..89155750 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: menu.h 3.2 2013/09/22 10:47:32 kls Exp $
+ * $Id: menu.h 3.3 2013/10/16 09:14:58 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);
};
diff --git a/vdr.c b/vdr.c
index 9769b0f2..083d838c 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
*
* The project's page is at http://www.tvdr.de
*
- * $Id: vdr.c 3.3 2013/10/10 12:25:03 kls Exp $
+ * $Id: vdr.c 3.4 2013/10/16 09:33:58 kls Exp $
*/
#include <getopt.h>
@@ -1239,7 +1239,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();