[Freeciv-Dev] (PR#12049) detaching from observer in pregame always removes it.

["Mike Kaufman" <kaufman@xxxxxxxxxxxxxxxxxxxxxx>]

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


This shouldn't be the case if another if observing too. Apparently the 
check is buggy. Here's a fix.

-mike

Index: server/stdinhand.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/stdinhand.c,v
retrieving revision 1.354.2.24
diff -u -r1.354.2.24 stdinhand.c
--- server/stdinhand.c  22 Jan 2005 20:23:08 -0000      1.354.2.24
+++ server/stdinhand.c  29 Jan 2005 17:10:10 -0000
@@ -3000,13 +3000,7 @@
 
   /* a special case for global observers: we don't want to remove the
    * observer player in pregame if someone else is also observing it */
-  i = 0;
-  conn_list_iterate(pplayer->connections, aconn) {
-    if (aconn->observer) {
-      i++;
-    }
-  } conn_list_iterate_end;
-  if (i > 1 && pconn->observer) {
+  if (pplayer->is_observer && conn_list_size(&pplayer->connections) > 1) {
     one_obs_among_many = TRUE;
   }