1 files changed, 26 insertions, 20 deletions

diff --git a/src/Config.cpp b/src/Config.cpp
index 626dcf3..b481374 100644
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -4,13 +4,13 @@
 
 namespace QuickMedia {
     static bool config_initialized = false;
-    static Config config;
+    static Config *config = nullptr;
 
     static float scale = 1.0f;
     static bool scale_set = false;
 
     static const int XFT_DPI_DEFAULT = 96;
-    // Returns 96 on error
+    // Returns XFT_DPI_DEFAULT on error
     static int xrdb_get_dpi() {
         int xft_dpi = XFT_DPI_DEFAULT;
 
@@ -63,84 +63,90 @@ namespace QuickMedia {
             return;
 
         config_initialized = true;
+        // Wtf? can't use static non-pointer config because it causes a segfault when setting config.theme.
+        // It looks like a libc bug??? crashes for both gcc and clang.
+        config = new Config();
         Path config_path = get_storage_dir().join("config.json");
         Json::Value json_root;
-        if(!read_file_as_json(config_path, json_root) || !json_root.isObject())
+        if(!read_file_as_json(config_path, json_root) || !json_root.isObject()) {
+            fprintf(stderr, "Warning: failed to parse config file: %s\n", config_path.data.c_str());
+            config->scale = get_ui_scale();
             return;
+        }
 
         const Json::Value &search_json = json_root["search"];
         if(search_json.isObject()) {
             const Json::Value &font_size_json = search_json["font_size"];
             if(font_size_json.isNumeric())
-                config.search.font_size = font_size_json.asDouble();
+                config->search.font_size = font_size_json.asDouble();
         }
 
         const Json::Value &tab_json = json_root["tab"];
         if(tab_json.isObject()) {
             const Json::Value &font_size_json = tab_json["font_size"];
             if(font_size_json.isNumeric())
-                config.tab.font_size = font_size_json.asDouble();
+                config->tab.font_size = font_size_json.asDouble();
         }
 
         const Json::Value &body_json = json_root["body"];
         if(body_json.isObject()) {
             const Json::Value &title_font_size = body_json["title_font_size"];
             if(title_font_size.isNumeric())
-                config.body.title_font_size = title_font_size.asDouble();
+                config->body.title_font_size = title_font_size.asDouble();
 
             const Json::Value &author_font_size = body_json["author_font_size"];
             if(author_font_size.isNumeric())
-                config.body.author_font_size = author_font_size.asDouble();
+                config->body.author_font_size = author_font_size.asDouble();
 
             const Json::Value &description_font_size = body_json["description_font_size"];
             if(description_font_size.isNumeric())
-                config.body.description_font_size = description_font_size.asDouble();
+                config->body.description_font_size = description_font_size.asDouble();
 
             const Json::Value &timestamp_font_size = body_json["timestamp_font_size"];
             if(timestamp_font_size.isNumeric())
-                config.body.timestamp_font_size = timestamp_font_size.asDouble();
+                config->body.timestamp_font_size = timestamp_font_size.asDouble();
 
             const Json::Value &reaction_font_size = body_json["reaction_font_size"];
             if(reaction_font_size.isNumeric())
-                config.body.reaction_font_size = reaction_font_size.asDouble();
+                config->body.reaction_font_size = reaction_font_size.asDouble();
 
             const Json::Value &embedded_load_font_size = body_json["embedded_load_font_size"];
             if(embedded_load_font_size.isNumeric())
-                config.body.embedded_load_font_size = embedded_load_font_size.asDouble();
+                config->body.embedded_load_font_size = embedded_load_font_size.asDouble();
         }
 
         const Json::Value &input_json = json_root["input"];
         if(input_json.isObject()) {
             const Json::Value &font_size_json = input_json["font_size"];
             if(font_size_json.isNumeric())
-                config.input.font_size = font_size_json.asDouble();
+                config->input.font_size = font_size_json.asDouble();
         }
 
         const Json::Value &use_system_fonts_json = json_root["use_system_fonts"];
         if(use_system_fonts_json.isBool())
-            config.use_system_fonts = use_system_fonts_json.asBool();
+            config->use_system_fonts = use_system_fonts_json.asBool();
 
         const Json::Value &use_system_mpv_config = json_root["use_system_mpv_config"];
         if(use_system_mpv_config.isBool())
-            config.use_system_mpv_config = use_system_mpv_config.asBool();
+            config->use_system_mpv_config = use_system_mpv_config.asBool();
 
         const Json::Value &theme_json = json_root["theme"];
         if(theme_json.isString())
-            config.theme = theme_json.asString();
+            config->theme = theme_json.asString();
 
         const Json::Value &scale_json = json_root["scale"];
         if(scale_json.isNumeric())
-            config.scale = scale_json.asDouble();
+            config->scale = scale_json.asDouble();
         else
-            config.scale = get_ui_scale();
+            config->scale = get_ui_scale();
 
         const Json::Value &font_scale = json_root["font_scale"];
         if(font_scale.isNumeric())
-            config.font_scale = font_scale.asDouble();
+            config->font_scale = font_scale.asDouble();
     }
 
     const Config& get_config() {
         init_config();
-        return config;
+        return *config;
     }
-}
\ No newline at end of file
+}