summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2004-05-29 10:23:21 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2004-05-29 10:23:21 +0200
commita4bdc1ada3e97eebc6ef28b6fa4d91ad9ae6ecbb (patch)
tree47fc6f39389284374206f8271b9e88aff49af315
parent1924da2cfec04735f92346f8f6fa5d5e325f5516 (diff)
downloadvdr-a4bdc1ada3e97eebc6ef28b6fa4d91ad9ae6ecbb.tar.gz
vdr-a4bdc1ada3e97eebc6ef28b6fa4d91ad9ae6ecbb.tar.bz2
Fixed removing the "scanning recordings..." message in case the video directory is empty
-rw-r--r--CONTRIBUTORS2
-rw-r--r--HISTORY2
-rw-r--r--menu.c9
3 files changed, 9 insertions, 4 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 0d5084ae..62b7c3a9 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -957,6 +957,8 @@ Jens Rosenboom <me@jayr.de>
Andreas Regel <andreas.regel@gmx.de>
for fixing handling bitmap indexes for 256 color mode
+ for reporting a bug in removing the "scanning recordings..." message in case the
+ video directory is empty
Thomas Bergwinkl <Thomas.Bergwinkl@t-online.de>
for fixing the validity check for channel IDs, because some providers use TIDs
diff --git a/HISTORY b/HISTORY
index 13d4e10e..ddbc4be9 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2853,3 +2853,5 @@ Video Disk Recorder Revision History
reporting this one).
- Now using more separate areas in the "ST:TNG Panels" skin to allow a theme to
use more independent clrMenu* colors.
+- Fixed removing the "scanning recordings..." message in case the video directory
+ is empty (thanks to Andreas Regel for reporting this one).
diff --git a/menu.c b/menu.c
index 889b82b1..49cdef4c 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 1.306 2004/05/23 11:21:06 kls Exp $
+ * $Id: menu.c 1.307 2004/05/29 10:19:22 kls Exp $
*/
#include "menu.h"
@@ -1421,9 +1421,10 @@ cMenuRecordings::cMenuRecordings(const char *Base, int Level, bool OpenSubMenus)
Display(); // this keeps the higher level menus from showing up briefly when pressing 'Back' during replay
if (!Base)
Skins.Message(mtStatus, tr("scanning recordings..."));
- if (Base || Recordings.Load()) {
- if (!Base)
- Skins.Message(mtStatus, NULL);
+ bool Loaded = Base || Recordings.Load();
+ if (!Base)
+ Skins.Message(mtStatus, NULL);
+ if (Loaded) {
const char *LastReplayed = cReplayControl::LastReplayed();
cMenuRecordingItem *LastItem = NULL;
char *LastItemText = NULL;