Author: mir3x
Date: Sun Nov  6 22:29:45 2016
New Revision: 34425

URL: http://svn.gna.org/viewcvs/freeciv?rev=34425&view=rev
Log:
Fixed invalid NULL default string for option gui_qt_default_theme_name.
Reported by Marko Lindqvist <cazfi>

See bug #25250

Modified:
    trunk/client/options.c
    trunk/client/options.h

Modified: trunk/client/options.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/options.c?rev=34425&r1=34424&r2=34425&view=diff
==============================================================================
--- trunk/client/options.c      (original)
+++ trunk/client/options.c      Sun Nov  6 22:29:45 2016
@@ -349,7 +349,7 @@
   .gui_qt_fullscreen = FALSE,
   .gui_qt_show_preview = TRUE,
   .gui_qt_sidebar_left = TRUE,
-  .gui_qt_default_theme_name = "NightStalker",
+  .gui_qt_default_theme_name = FC_QT_DEFAULT_THEME_NAME,
   .gui_qt_font_city_label = "Monospace,8,-1,5,50,0,0,0,0,0",
   .gui_qt_font_default = "Sans Serif,10,-1,5,75,0,0,0,0,0",
   .gui_qt_font_notify_label = "Monospace,8,-1,5,75,0,0,0,0,0",
@@ -1948,7 +1948,7 @@
   GEN_STR_LIST_OPTION(gui_qt_default_theme_name, N_("Theme"),
                       N_("By changing this option you change the "
                          "active theme."),
-                      COC_GRAPHICS, GUI_QT, NULL,
+                      COC_GRAPHICS, GUI_QT, FC_QT_DEFAULT_THEME_NAME,
                       get_themes_list, theme_reread_callback, 0),
 
   /* It's important to give empty string instead of NULL as as default

Modified: trunk/client/options.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/options.h?rev=34425&r1=34424&r2=34425&view=diff
==============================================================================
--- trunk/client/options.h      (original)
+++ trunk/client/options.h      Sun Nov  6 22:29:45 2016
@@ -363,6 +363,7 @@
   bool gui_sdl2_use_color_cursors;
 
 /* gui-qt client specific options. */
+#define FC_QT_DEFAULT_THEME_NAME "NightStalker"
   bool gui_qt_fullscreen;
   bool gui_qt_show_preview;
   bool gui_qt_allied_chat_only;


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to