[Freeciv-Dev] (PR#40234) [Patch] Start button sensitivity

[Marko Lindqvist]

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

 GTK-2

 Current Start button sensitivity checks against global observer, but
observer attached to player cannot start game either.

 Fix attached.


 - ML


diff -Nurd -X.diff_ignore freeciv/client/gui-gtk-2.0/gui_main.c freeciv/client/gui-gtk-2.0/gui_main.c
--- freeciv/client/gui-gtk-2.0/gui_main.c	2008-03-08 16:12:56.000000000 +0200
+++ freeciv/client/gui-gtk-2.0/gui_main.c	2008-05-08 00:48:29.000000000 +0300
@@ -1586,7 +1586,9 @@
   } else {
     gtk_stockbutton_set_label(ready_button, _("_Start"));
   }
-  gtk_widget_set_sensitive(ready_button, (NULL != client.conn.playing));
+
+  /* Observer cannot start game. */
+  gtk_widget_set_sensitive(ready_button, (!client.conn.observer));
 
   gtk_stockbutton_set_label(nation_button, _("Pick _Nation"));
   if (NULL == client.conn.playing) {

diff -Nurd -X.diff_ignore freeciv/client/gui-gtk-2.0/gui_main.c freeciv/client/gui-gtk-2.0/gui_main.c
--- freeciv/client/gui-gtk-2.0/gui_main.c	2008-01-15 04:04:31.000000000 +0200
+++ freeciv/client/gui-gtk-2.0/gui_main.c	2008-05-08 00:55:16.000000000 +0300
@@ -1511,7 +1511,9 @@
   } else {
     gtk_stockbutton_set_label(ready_button, _("_Start"));
   }
-  gtk_widget_set_sensitive(ready_button, (game.player_ptr != NULL));
+
+  /* Observer cannot start game. */
+  gtk_widget_set_sensitive(ready_button, (!aconnection.observer));
 
   gtk_stockbutton_set_label(nation_button, _("Pick _Nation"));
   if (!aconnection.player) {

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