Author: cazfi
Date: Wed Mar 30 17:11:04 2016
New Revision: 32279

URL: http://svn.gna.org/viewcvs/freeciv?rev=32279&view=rev
Log:
When a trade route gets cancelled, send updated info about partner cities too.

Reported by Andreas Røsdal <andreasr>

See bug #23708

Modified:
    branches/S2_6/client/clinet.c
    branches/S2_6/server/citytools.c

Modified: branches/S2_6/client/clinet.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/clinet.c?rev=32279&r1=32278&r2=32279&view=diff
==============================================================================
--- branches/S2_6/client/clinet.c       (original)
+++ branches/S2_6/client/clinet.c       Wed Mar 30 17:11:04 2016
@@ -1,4 +1,4 @@
-/********************************************************************** 
+/**********************************************************************
  Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -413,10 +413,9 @@
 
   nb = read_from_connection(&client.conn, FALSE);
   if (0 <= nb) {
-    enum packet_type type;
-
     agents_freeze_hint();
     while (client.conn.used) {
+      enum packet_type type;
       void *packet = get_packet_from_connection(&client.conn, &type);
 
       if (NULL != packet) {

Modified: branches/S2_6/server/citytools.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/citytools.c?rev=32279&r1=32278&r2=32279&view=diff
==============================================================================
--- branches/S2_6/server/citytools.c    (original)
+++ branches/S2_6/server/citytools.c    Wed Mar 30 17:11:04 2016
@@ -2589,6 +2589,9 @@
 
   if (announce) {
     announce_trade_route_removal(pc1, pc2, source_gone);
+
+    city_refresh(pc2);
+    send_city_info(city_owner(pc2), pc2);
   }
 }
 


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

Reply via email to