Author: cazfi
Date: Sun Nov  1 20:00:50 2015
New Revision: 30362

URL: http://svn.gna.org/viewcvs/freeciv?rev=30362&view=rev
Log:
Use '_safe' iteration when iterating through city traderoutes to remove.

See bug #24004

Modified:
    trunk/server/citytools.c

Modified: trunk/server/citytools.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/citytools.c?rev=30362&r1=30361&r2=30362&view=diff
==============================================================================
--- trunk/server/citytools.c    (original)
+++ trunk/server/citytools.c    Sun Nov  1 20:00:50 2015
@@ -1714,9 +1714,9 @@
     return;
   }
 
-  trade_routes_iterate(pcity, pother_city) {
-    remove_trade_route(pcity, pother_city, TRUE, TRUE);
-  } trade_routes_iterate_end;
+  trade_routes_iterate_safe(pcity, proute) {
+    remove_trade_route(pcity, proute, TRUE, TRUE);
+  } trade_routes_iterate_safe_end;
 
   map_clear_border(pcenter);
   city_workers_queue_remove(pcity);


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to