Version 1.2.6pre3vdr-1.2.6pre3

- Improved cDvbDevice::StillPicture() (thanks to Oliver Endriss).
- Continuing learning remote control keys in case one rc fails (thanks to
  Oliver Endriss).
- Fixed handling comments in editing marks.

5 files changed, 15 insertions, 10 deletions

diff --git a/HISTORY b/HISTORY
index 45137f6..d121437 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2437,3 +2437,10 @@ Video Disk Recorder Revision History
 2003-10-19: Version 1.2.6pre2
 
 - Improved cDvbDevice::StillPicture() (thanks to Thomas Heiligenmann).
+
+2003-10-24: Version 1.2.6pre3
+
+- Improved cDvbDevice::StillPicture() (thanks to Oliver Endriss).
+- Continuing learning remote control keys in case one rc fails (thanks to
+  Oliver Endriss).
+- Fixed handling comments in editing marks.
diff --git a/config.h b/config.h
index 6faca7c..625e3e6 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.176.1.1 2003/10/19 11:43:07 kls Exp $
+ * $Id: config.h 1.176.1.2 2003/10/24 14:31:17 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,7 +19,7 @@
 #include "device.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.2.6pre2"
+#define VDRVERSION  "1.2.6pre3"
 #define VDRVERSNUM   10206  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
diff --git a/dvbdevice.c b/dvbdevice.c
index 0dedfe8..ebb236e 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.67.1.1 2003/10/19 11:41:07 kls Exp $
+ * $Id: dvbdevice.c 1.67.1.2 2003/10/24 14:32:20 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -963,7 +963,7 @@ void cDvbDevice::StillPicture(const uchar *Data, int Length)
                     offs += Data[i + 8];
                     len -= 3;
                     len -= Data[i + 8];
-                    if (len < 0 || offs + len >= Length)
+                    if (len < 0 || offs + len > Length)
                        break;
                     }
                  else {
diff --git a/interface.c b/interface.c
index cff0774..a0ee9cc 100644
--- a/interface.c
+++ b/interface.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.c 1.65 2003/10/05 09:48:13 kls Exp $
+ * $Id: interface.c 1.66 2003/10/24 14:38:08 kls Exp $
  */
 
 #include "interface.h"
@@ -433,7 +433,7 @@ void cInterface::LearnKeys(void)
          Clear();
          if (!rc) {
             Close();
-            return;
+            continue;
             }
          WriteText(1, 1, Headline);
          WriteText(1, 3, tr("Phase 3: Saving key codes"));
diff --git a/recording.c b/recording.c
index b6e47c5..13aa417 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.84 2003/10/17 14:36:58 kls Exp $
+ * $Id: recording.c 1.85 2003/10/24 14:47:14 kls Exp $
  */
 
 #include "recording.h"
@@ -681,10 +681,8 @@ bool cMark::Parse(const char *s)
   const char *p = strchr(s, ' ');
   if (p) {
      p = skipspace(p);
-     if (*p) {
+     if (*p)
         comment = strdup(p);
-        comment[strlen(comment) - 1] = 0; // strips trailing newline
-        }
      }
   return true;
 }