From ca66d29798db7cd9c3eb1bb8429612966e639dce Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sun, 29 May 2005 11:22:39 +0200 Subject: [PATCH] Fixed listing recordings with empty episode names in the LSTR command --- CONTRIBUTORS | 2 ++ HISTORY | 2 ++ recording.c | 5 +++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 96d21c65..1c0c2020 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -197,6 +197,8 @@ Stefan Huelswitt for fixing handling symbolic links in cRecordings::ScanVideoDir() for reporting a memory leak in tComponent for fixing a memory leak in cDvbPlayer + for pointing out that recordings with empty episode names were not listed correctly + in the LSTR command Ulrich Röder for pointing out that there are channels that have a symbol rate higher than 27500 diff --git a/HISTORY b/HISTORY index 287ab693..81cbefb6 100644 --- a/HISTORY +++ b/HISTORY @@ -3573,3 +3573,5 @@ Video Disk Recorder Revision History - Avoiding unnecessary calls to getLength() in libsi/si.c, and avoiding the '& 0xff' in CRC32::crc32() of libsi/util.c (thanks to Georg Acher). - Speeded up deleting duplicate channels. +- Fixed listing recordings with empty episode names in the LSTR command (thanks + to Stefan Huelswitt for pointing this out). diff --git a/recording.c b/recording.c index 8ee26c8a..93b0af8f 100644 --- a/recording.c +++ b/recording.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: recording.c 1.106 2005/05/28 11:36:14 kls Exp $ + * $Id: recording.c 1.107 2005/05/29 11:16:57 kls Exp $ */ #include "recording.h" @@ -603,7 +603,8 @@ const char *cRecording::Title(char Delimiter, bool NewIndicator, int Level) cons Delimiter, s); // let's not display a trailing '~': - stripspace(titleBuffer); + if (!NewIndicator) + stripspace(titleBuffer); s = &titleBuffer[strlen(titleBuffer) - 1]; if (*s == '~') *s = 0;