Revert "[WIP] don't create default folders if other folders are set already"

This commit is contained in:
Twinaphex 2015-09-17 22:05:14 +02:00
parent 2f1e3e4cf3
commit 4784371a90
4 changed files with 20 additions and 25 deletions

View File

@ -125,15 +125,10 @@ void main_exit(void *args)
static void check_defaults_dirs(void) static void check_defaults_dirs(void)
{ {
settings_t *settings = NULL; if (*g_defaults.dir.core_assets)
settings = config_get_ptr(); path_mkdir(g_defaults.dir.core_assets);
if (*g_defaults.dir.remap)
if(settings->core_assets_directory[0] == '\0') path_mkdir(g_defaults.dir.remap);
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) if (*g_defaults.dir.autoconfig)
path_mkdir(g_defaults.dir.autoconfig); path_mkdir(g_defaults.dir.autoconfig);
if (*g_defaults.dir.audio_filter) if (*g_defaults.dir.audio_filter)
@ -246,6 +241,8 @@ bool main_load_content(int argc, char **argv, void *args,
if (environ_get) if (environ_get)
environ_get(rarch_argc_ptr, rarch_argv_ptr, args, wrap_args); environ_get(rarch_argc_ptr, rarch_argv_ptr, args, wrap_args);
check_defaults_dirs();
if (wrap_args->touched) if (wrap_args->touched)
{ {
rarch_main_init_wrap(wrap_args, &rarch_argc, rarch_argv); rarch_main_init_wrap(wrap_args, &rarch_argc, rarch_argv);
@ -265,8 +262,6 @@ bool main_load_content(int argc, char **argv, void *args,
event_command(EVENT_CMD_RESUME); event_command(EVENT_CMD_RESUME);
check_defaults_dirs();
if (process_args) if (process_args)
process_args(rarch_argc_ptr, rarch_argv_ptr); process_args(rarch_argc_ptr, rarch_argv_ptr);