Author: cazfi
Date: Tue Nov 10 23:03:02 2015
New Revision: 30524
URL: http://svn.gna.org/viewcvs/freeciv?rev=30524&view=rev
Log:
Do not save sdl-client options any more once they have been migrated to
sdl2-client.
See patch #6530
Modified:
trunk/client/options.c
Modified: trunk/client/options.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/options.c?rev=30524&r1=30523&r2=30524&view=diff
==============================================================================
--- trunk/client/options.c (original)
+++ trunk/client/options.c Tue Nov 10 23:03:02 2015
@@ -5498,7 +5498,11 @@
"client.migration_qt_from_2_5");
client_options_iterate_all(poption) {
- client_option_save(poption, sf);
+ if (client_poption->specific != GUI_SDL ||
!gui_options.gui_sdl2_migrated_from_sdl) {
+ /* Once sdl-client options have been migrated to sdl2-client, there's no
+ * use for them any more, so no point in saving them. */
+ client_option_save(poption, sf);
+ }
} client_options_iterate_all_end;
message_options_save(sf, "client");
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
