[Freeciv-Dev] (PR#14379) Cannot withdraw vision

["Mateusz Stefek" <mstefek@xxxxxxxxx>]

<URL: http://bugs.freeciv.org/Ticket/Display.html?id=14379 >

> [chrisk - Wed Oct 19 10:30:58 2005]:
> 
> 
> SVN HEAD 19 OCT 2005 GTK2
> 
> I have been allied with the persian and declared war. Neither then nor
> afterwards it is possible to withdraw vision from him.
> 
> Savegame see PR#14376
> 
> Christian
> 
Here's a patch.
--
mateusz

Index: server/plrhand.c
===================================================================
--- server/plrhand.c    (wersja 11150)
+++ server/plrhand.c    (kopia robocza)
@@ -507,10 +507,6 @@
   old_type = pplayer->diplstates[other_player_id].type;
   pplayer2 = get_player(other_player_id);
 
-  if (old_type == DS_WAR) {
-    return; /* Duh */
-  }
-
   /* can't break a pact with yourself */
   if (pplayer == pplayer2) {
     return;
@@ -532,6 +528,11 @@
     return;
   }
 
+  if (old_type == DS_WAR) {
+    return; /* Duh */
+  }
+
+
   /* else, breaking a treaty */
 repeat_break_treaty: