Author: cazfi Date: Thu Jan 5 07:28:17 2017 New Revision: 34784 URL: http://svn.gna.org/viewcvs/freeciv?rev=34784&view=rev Log: Do not save gtk2-client options when they are no longer needed.
See patch #8060 Modified: trunk/client/options.c Modified: trunk/client/options.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/options.c?rev=34784&r1=34783&r2=34784&view=diff ============================================================================== --- trunk/client/options.c (original) +++ trunk/client/options.c Thu Jan 5 07:28:17 2017 @@ -6060,9 +6060,10 @@ /* gui-enabled options */ client_options_iterate_all(poption) { - 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. */ + if ((client_poption->specific != GUI_SDL || !gui_options.gui_sdl2_migrated_from_sdl) + && (client_poption->specific != GUI_GTK2 || !gui_options.gui_gtk3_migrated_from_gtk2)) { + /* Once sdl-client options have been migrated to sdl2-client, or gtk2-client options + * to gtk3-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; _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits