[Freeciv-Dev] (PR#11180) civclient loops

["Vasco Alexandre da Silva Costa" <vasc@xxxxxxxxxxxxxx>]

<URL: http://rt.freeciv.org/Ticket/Display.html?id=11180 >

This patch should fix it, as well as a bug in the worklists I found
while trying to see if this mistake was duplicated someplace else. I'll
commit it ASAP. Please test and report if it has been fixed.


Index: client/gui-gtk-2.0/plrdlg.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk-2.0/plrdlg.c,v
retrieving revision 1.45
diff -u -r1.45 plrdlg.c
--- client/gui-gtk-2.0/plrdlg.c 23 Nov 2004 22:01:00 -0000      1.45
+++ client/gui-gtk-2.0/plrdlg.c 25 Nov 2004 01:02:00 -0000
@@ -586,6 +586,7 @@
        } else {
          gtk_list_store_remove(store, &it);
        }
+       it = it_next;
       } while (more);
     }
 
Index: client/gui-gtk-2.0/wldlg.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk-2.0/wldlg.c,v
retrieving revision 1.37
diff -u -r1.37 wldlg.c
--- client/gui-gtk-2.0/wldlg.c  26 Oct 2004 17:34:26 -0000      1.37
+++ client/gui-gtk-2.0/wldlg.c  25 Nov 2004 01:02:01 -0000
@@ -1374,12 +1374,15 @@
 
   if (exists) {
     GtkTreeIter it_next;
+    bool more;
 
     do {
       it_next = it;
-      gtk_list_store_remove(ptr->dst, &it);
+      more = gtk_tree_model_iter_next(model, &it_next);
 
-    } while (gtk_tree_model_iter_next(model, &it_next));
+      gtk_list_store_remove(ptr->dst, &it);
+      it = it_next;
+    } while (more);
   }
 
   /* update widget sensitivity. */