From fb32cbdea259b2eeac6fe682abcac0acfb457419 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 26 Jan 2022 18:05:15 +0200 Subject: [PATCH 33/33] Don't save gtk3-client options once there's no use for them any more Once settings have been migrated from the gtk3-client to gtk3.22-client, there's no need to store those settings any more. There's no gtk3-client, and the settings are not going the get migrated again. See osdn #43689 Signed-off-by: Marko Lindqvist --- client/options.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/client/options.c b/client/options.c index 56982d8660..78ee427f3f 100644 --- a/client/options.c +++ b/client/options.c @@ -5919,9 +5919,10 @@ void options_save(option_save_log_callback log_cb) /* gui-enabled options */ client_options_iterate_all(poption) { 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_poption->specific != GUI_GTK2 || !gui_options.gui_gtk3_migrated_from_gtk2) + && (client_poption->specific != GUI_GTK3 || !gui_options.gui_gtk3_22_migrated_from_gtk3)) { + /* Once options have been migrated from a client that no longer exist to a newer client, + * there's no use for those settings of dropped client any more, so no point in saving them. */ client_option_save(poption, sf); } } client_options_iterate_all_end; -- 2.34.1