Author: jtn
Date: Fri Jan 2 11:10:15 2015
New Revision: 27486
URL: http://svn.gna.org/viewcvs/freeciv?rev=27486&view=rev
Log:
Fix trouble with Gtk pick nation dialog after changing from a ruleset
with a hidden nation group.
See gna bug #23128.
Modified:
trunk/client/gui-gtk-2.0/dialogs.c
trunk/client/gui-gtk-3.0/dialogs.c
Modified: trunk/client/gui-gtk-2.0/dialogs.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-2.0/dialogs.c?rev=27486&r1=27485&r2=27486&view=diff
==============================================================================
--- trunk/client/gui-gtk-2.0/dialogs.c (original)
+++ trunk/client/gui-gtk-2.0/dialogs.c Fri Jan 2 11:10:15 2015
@@ -695,6 +695,7 @@
for (i = 0; i < nation_group_count(); i++) {
struct nation_group* group = (nation_group_by_number(i));
if (is_nation_group_hidden(group)) {
+ races_nation_list[i] = NULL;
continue;
}
nation_list = create_list_of_nations_in_group(group, i);
Modified: trunk/client/gui-gtk-3.0/dialogs.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/dialogs.c?rev=27486&r1=27485&r2=27486&view=diff
==============================================================================
--- trunk/client/gui-gtk-3.0/dialogs.c (original)
+++ trunk/client/gui-gtk-3.0/dialogs.c Fri Jan 2 11:10:15 2015
@@ -705,6 +705,7 @@
for (i = 0; i < nation_group_count(); i++) {
struct nation_group* group = (nation_group_by_number(i));
if (is_nation_group_hidden(group)) {
+ races_nation_list[i] = NULL;
continue;
}
nation_list = create_list_of_nations_in_group(group, i);
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
