New patch to revert part of svn2859

This changeset leads to a null pointer error.

diff --git a/debian/patches/revert-part-of-svn2859 b/debian/patches/revert-part-of-svn2859
new file mode 100644 (file)
index 0000000..c3f39b8
--- /dev/null
+++ b/debian/patches/revert-part-of-svn2859
@@ -0,0 +1,23 @@
+Revert part of svn2859 which lead to null pointer
+diff --git a/navit/graphics.c b/navit/graphics.c
+index 111456d..743b00d 100644
+--- a/navit/graphics.c
++++ b/navit/graphics.c
+@@ -2184,7 +2184,7 @@ graphics_process_selection_item(struct displaylist *dl, struct item *item)
+                       return;
+               }
+       }
+-      mr=map_rect_new(item->map, NULL);
++/*    mr=map_rect_new(item->map, NULL);
+       item=map_rect_get_item_byid(mr, item->id_hi, item->id_lo);
+       count=item_coord_get(item, ca, item->type < type_line ? 1: max);
+       if (!item_attr_get(item, attr_label, &attr))
+@@ -2195,7 +2195,7 @@ graphics_process_selection_item(struct displaylist *dl, struct item *item)
+               map_convert_free(str);
+       } else
+               display_add(dl, item, count, ca, attr.u.str);
+-      map_rect_destroy(mr);
++      map_rect_destroy(mr);*/
+ }
+ 
+ void

diff --git a/debian/patches/series b/debian/patches/series
index 418057a..963bf41 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@ remove-support
 no-default-poi-geodownload
 libgps-2.90-fix
 mg-unhandled-attr
+revert-part-of-svn2859