mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-26 06:40:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reintroduce block_config_read

Browse Source
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;
bool block_config_read;
// Settings and/or global state that is specific to a console-style implementation.
struct
{

3
retroarch.c
View File

@ -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();

9
settings.c
View File

@ -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();
@ -318,8 +320,11 @@ static void parse_config_file(void);
void config_load(void)
{
config_set_defaults();
parse_config_file();
if (!g_extern.block_config_read)
{
config_set_defaults();
parse_config_file();
}
}
static config_file_t *open_default_config_file(void)