r668 - vdr/vdr/trunk/debian/patches

[Thomas Schmidt]

Author: tschmidt
Date: 2005-06-18 14:42:02 +0000 (Sat, 18 Jun 2005)
New Revision: 668

Modified:
   vdr/vdr/trunk/debian/patches/18_vdr-1.3.26-pagedown-fix.dpatch
Log:
vdr: Replaced the (broken) 18_vdr-1.3.26-pagedown-fix.dpatch
     by the version from Udo Richter <udo_richter@gmx.de>


Modified: vdr/vdr/trunk/debian/patches/18_vdr-1.3.26-pagedown-fix.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/18_vdr-1.3.26-pagedown-fix.dpatch	2005-06-18 14:29:29 UTC (rev 667)
+++ vdr/vdr/trunk/debian/patches/18_vdr-1.3.26-pagedown-fix.dpatch	2005-06-18 14:42:02 UTC (rev 668)
@@ -1,19 +1,21 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 18_vdr-1.3.26-pagedown-fix.dpatch by Klaus Schmidinger <Klaus.Schmidinger@cadsoft.de>
+## 18_vdr-1.3.26-pagedown-fix.dpatch by Udo Richter <udo_richter@gmx.de>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Fix handling of the "page down" function
 
 @DPATCH@
-diff -urNad vdr-1.3.26/osdbase.c /tmp/dpep.Devsn7/vdr-1.3.26/osdbase.c
+diff -urNad vdr-1.3.26/osdbase.c /tmp/dpep.Vp2fkN/vdr-1.3.26/osdbase.c
 --- vdr-1.3.26/osdbase.c	2005-06-12 12:44:22.000000000 +0200
-+++ /tmp/dpep.Devsn7/vdr-1.3.26/osdbase.c	2005-06-12 17:35:50.779644016 +0200
-@@ -362,7 +362,7 @@
-   if (current >= 0) {
-      if (current < first)
-         first = current;
--     else if (current - first >= displayMenuItems)
-+     if (current - first >= displayMenuItems || current == last)
-         first = current - displayMenuItems + 1;
-      }
-   if (current != oldCurrent || first != oldFirst) {
++++ /tmp/dpep.Vp2fkN/vdr-1.3.26/osdbase.c	2005-06-18 16:39:23.488592296 +0200
+@@ -350,6 +350,10 @@
+   current += displayMenuItems;
+   first += displayMenuItems;
+   int last = Count() - 1;
++  if (first + displayMenuItems > last) {
++     first = last - displayMenuItems + 1;
++     if (first < 0) first = 0;
++     }
+   int tmpCurrent = current;
+   while (!SelectableItem(tmpCurrent) && ++tmpCurrent <= last)
+         ;