Fixed removing the "scanning recordings..." message in case the video directory is empty

This commit is contained in:
Klaus Schmidinger 2004-05-29 10:23:21 +02:00
parent 1924da2cfe
commit a4bdc1ada3
3 changed files with 9 additions and 4 deletions

View File

@ -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

View File

@ -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).

9
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 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;