Reintroduce block_config_read

general.h

@@ -469,6 +469,8 @@ struct global
 
    cheat_manager_t *cheat;
 
+   bool block_config_read;
+
    // Settings and/or global state that is specific to a console-style implementation.
    struct
    {

retroarch.c

@@ -2672,10 +2672,7 @@ int rarch_main_init(int argc, char *argv[])
    }
 
    validate_cpu_features();
-#ifndef RARCH_CONSOLE
-   /* we already do this at startup */
    config_load();
-#endif
 
    init_libretro_sym();
    rarch_init_system_info();

settings.c

@@ -309,6 +309,8 @@ void config_set_defaults(void)
 #ifdef HAVE_ZLIB
    g_extern.file_state.zip_extract_mode = 0;
 #endif
+
+   g_extern.block_config_read = true;
 #endif
 
    rarch_init_msg_queue();
@@ -317,10 +319,13 @@ void config_set_defaults(void)
 static void parse_config_file(void);
 
 void config_load(void)
+{
+   if (!g_extern.block_config_read)
    {
       config_set_defaults();
       parse_config_file();
    }
+}
 
 static config_file_t *open_default_config_file(void)
 {