Fixed handling 'summary.vdr' files with more than two empty lines

4 files changed, 8 insertions, 5 deletions

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index eff35c7b..6c86b153 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -828,6 +828,7 @@ Christian Jacobsen <christian.jacobsen@stageholding.de>
  for reporting a problem in handling the '-E' options in version 1.3.18
  for reporting a problem in case a station defines all 32 audio PIDs
  for suggestions and experiments regarding the buffer reserve in cTransfer
+ for reporting a problem with 'summary.vdr' files with more than two empty lines
 
 Andreas Mair <Andreas.Mair@linogate.com>
  for reporting a short display of the main menu if a plugin displays its own OSD and
diff --git a/HISTORY b/HISTORY
index 0250f6ad..2d405771 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3582,3 +3582,5 @@ Video Disk Recorder Revision History
 
 - Updated the Estonian OSD texts (thanks to Arthur Konovalov).
 - Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
+- Fixed handling 'summary.vdr' files with more than two empty lines (thanks to
+  Christian Jacobsen for reporting this one).
diff --git a/recording.c b/recording.c
index 93b0af8f..4549b464 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.107 2005/05/29 11:16:57 kls Exp $
+ * $Id: recording.c 1.108 2005/06/04 11:31:24 kls Exp $
  */
 
 #include "recording.h"
@@ -480,8 +480,8 @@ cRecording::cRecording(const char *FileName)
            char *data[3] = { NULL };
            cReadLine ReadLine;
            char *s;
-           while ((s = ReadLine.Read(f)) != NULL && line < 3) {
-                 if (*s) {
+           while ((s = ReadLine.Read(f)) != NULL) {
+                 if (*s || line > 1) {
                     if (data[line]) {
                        int len = strlen(s);
                        len += strlen(data[line]) + 1;
diff --git a/summary2info.pl b/summary2info.pl
index 8e80abe0..f757ac36 100755
--- a/summary2info.pl
+++ b/summary2info.pl
@@ -10,7 +10,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: summary2info.pl 1.2 2005/05/22 10:37:47 kls Exp $
+# $Id: summary2info.pl 1.3 2005/06/04 11:33:09 kls Exp $
 
 $VideoDir = $ARGV[0] || die "please provide the name of the video directory\n";
 
@@ -24,7 +24,7 @@ for $SummaryFile (@SummaryFiles) {
     @data = ();
     while (<F>) {
           chomp;
-          if ($_) {
+          if ($_ || $line > 1) {
              $data[$line] .= '|' if ($data[$line]);
              $data[$line] .= $_;
              }