Labelling: Fixes in map parts generation

diff --git a/labeller.c b/labeller.c
index 84811ab630892958a9fb3363956d652ee1394216..f0ddeffe26febbabb4cf8b079daf9947a1b4f3b9 100644 (file)
--- a/labeller.c
+++ b/labeller.c
@@ -1431,7 +1431,8 @@ void update_map_parts(struct placement *p)
   while (ml)
   {
     struct map_placement *mp = ml->mp;
-    mp->prev = mp->next;
+
+    mp->prev->next = mp->next;
     if (mp->next)
       mp->next->prev = mp->prev;
     free(mp);
@@ -1440,6 +1441,7 @@ void update_map_parts(struct placement *p)
     ml = ml->next;
     free(tmp);
   }
+  p->map_links = NULL;
 
   struct map_part **parts = get_map_parts(p);
   if (parts == NULL) return;
@@ -1450,6 +1452,7 @@ void update_map_parts(struct placement *p)
     mp->placement = p;
 
     mp->next = parts[i]->placement->next;
+    mp->prev = parts[i]->placement;
     parts[i]->placement->next = mp;
     if (mp->next) mp->next->prev = mp;