Merge pull request #2131 from fr500/master
[WIP] don't create default folders if other folders are set already
This commit is contained in:
commit
2f1e3e4cf3
|
@ -125,10 +125,15 @@ void main_exit(void *args)
|
|||
|
||||
static void check_defaults_dirs(void)
|
||||
{
|
||||
if (*g_defaults.dir.core_assets)
|
||||
path_mkdir(g_defaults.dir.core_assets);
|
||||
if (*g_defaults.dir.remap)
|
||||
path_mkdir(g_defaults.dir.remap);
|
||||
settings_t *settings = NULL;
|
||||
settings = config_get_ptr();
|
||||
|
||||
if(settings->core_assets_directory[0] == '\0')
|
||||
if (*g_defaults.dir.core_assets)
|
||||
path_mkdir(g_defaults.dir.core_assets);
|
||||
if(settings->input_remapping_directory[0] == '\0')
|
||||
if (*g_defaults.dir.remap)
|
||||
path_mkdir(g_defaults.dir.remap);
|
||||
if (*g_defaults.dir.autoconfig)
|
||||
path_mkdir(g_defaults.dir.autoconfig);
|
||||
if (*g_defaults.dir.audio_filter)
|
||||
|
@ -241,8 +246,6 @@ bool main_load_content(int argc, char **argv, void *args,
|
|||
if (environ_get)
|
||||
environ_get(rarch_argc_ptr, rarch_argv_ptr, args, wrap_args);
|
||||
|
||||
check_defaults_dirs();
|
||||
|
||||
if (wrap_args->touched)
|
||||
{
|
||||
rarch_main_init_wrap(wrap_args, &rarch_argc, rarch_argv);
|
||||
|
@ -262,6 +265,8 @@ bool main_load_content(int argc, char **argv, void *args,
|
|||
|
||||
event_command(EVENT_CMD_RESUME);
|
||||
|
||||
check_defaults_dirs();
|
||||
|
||||
if (process_args)
|
||||
process_args(rarch_argc_ptr, rarch_argv_ptr);
|
||||
|
||||
|
|
Loading…
Reference in New Issue