ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reintroduce block_config_read

This commit is contained in:
twinaphex 2013-01-10 06:45:44 +01:00
parent cc71a83fa8
commit d36af814c6
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
general.h
View File

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

3
retroarch.c
View File

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

5
settings.c
View File

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