summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2013-03-18 09:19:42 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2013-03-18 09:19:42 +0100
commitb7f4536fe144da31cf1843dad5fa01c630c23bf5 (patch)
tree4164cd886b5938e35427291b9c1d52b740e67985
parentb6d407a212bf470f1a8518b6c184ff00b26202ee (diff)
downloadvdr-b7f4536fe144da31cf1843dad5fa01c630c23bf5.tar.gz
vdr-b7f4536fe144da31cf1843dad5fa01c630c23bf5.tar.bz2
The "Resume" button in the main menu is now only active if the respective recording actually exists
-rw-r--r--CONTRIBUTORS2
-rw-r--r--HISTORY2
-rw-r--r--menu.c4
3 files changed, 7 insertions, 1 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 67be87ca..3cec144e 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2741,6 +2741,8 @@ Johann Friedrichs <johann.friedrichs@web.de>
for implementing scaling of SPU bitmaps
for fixing creating a new VPS timer with the SVDRP command NEWT
for fixing loading the setup.conf file in case a parameter contains the '#' character
+ for reporting that the "Resume" button in the main menu was active even if the
+ respective recording did not exist
Timo Helkio <timolavi@mbnet.fi>
for reporting a hangup when replaying a TS recording with subtitles activated
diff --git a/HISTORY b/HISTORY
index 0cf0c8cd..4e9b3aa6 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7765,3 +7765,5 @@ Video Disk Recorder Revision History
- Renamed the language file sr_SR.po to sr_RS.po (pointed out by Zoran Turalija).
- Fixed loading the setup.conf file in case a parameter contains the '#' character
(thanks to Johann Friedrichs).
+- The "Resume" button in the main menu is now only active if the respective recording
+ actually exists (reported by Johann Friedrichs).
diff --git a/menu.c b/menu.c
index 77326972..31d25d08 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.81 2013/03/04 14:11:47 kls Exp $
+ * $Id: menu.c 2.82 2013/03/18 09:11:48 kls Exp $
*/
#include "menu.h"
@@ -4566,6 +4566,8 @@ const char *cReplayControl::NowReplaying(void)
const char *cReplayControl::LastReplayed(void)
{
+ if (!Recordings.GetByName(fileName))
+ fileName = NULL;
return fileName;
}