<URL: http://bugs.freeciv.org/Ticket/Display.html?id=40455 >
> [EMAIL PROTECTED] - Thu Aug 21 16:27:38 2008]:
>
> If a user joins or disconnects, it closes the pick nation dialog in
> 2.1.6 gtk2 client.
I have confirmed this bug in S2_1, S2_2 and trunk. Attached
patch moves the call to popdown_races_dialog() to a possibly
better location.
----------------------------------------------------------------------
安心しろ。俺の銃を持ってきておいたぞ。
diff --git a/client/packhand.c b/client/packhand.c
index f0af5a9..60c980b 100644
--- a/client/packhand.c
+++ b/client/packhand.c
@@ -1595,10 +1595,6 @@ void handle_game_info(struct packet_game_info *pinfo)
game.government_during_revolution =
government_by_number(game.info.government_during_revolution_id);
- if (C_S_PREPARING == client_state()) {
- /* FIXME: only for change in nations */
- popdown_races_dialog();
- }
boot_help = (can_client_change_view()
&& game.info.spacerace != pinfo->spacerace);
if (game.info.timeout != 0 && pinfo->seconds_to_phasedone >= 0) {
@@ -2437,6 +2433,10 @@ void handle_ruleset_control(struct packet_ruleset_control *packet)
update_client_state(C_S_PREPARING);
+ /* The ruleset is going to load new nations. So close
+ * the nation selection dialog if it is open. */
+ popdown_races_dialog();
+
ruleset_data_free();
ruleset_cache_init();
_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
