mirror of
https://github.com/libretro/RetroArch
synced 2025-02-06 09:40:06 +00:00
Merge pull request #2208 from fr500/master
don't use $HOME/downloads or $HOME/pictures
This commit is contained in:
commit
b1f946ea75
@ -1976,21 +1976,10 @@ static void frontend_linux_get_env(int *argc,
|
||||
"overlay", sizeof(g_defaults.dir.overlay));
|
||||
fill_pathname_join(g_defaults.dir.osk_overlay, base_path,
|
||||
"overlay", sizeof(g_defaults.dir.osk_overlay));
|
||||
|
||||
if(home)
|
||||
{
|
||||
fill_pathname_join(g_defaults.dir.screenshot, home,
|
||||
"Pictures", sizeof(g_defaults.dir.screenshot));
|
||||
fill_pathname_join(g_defaults.dir.core_assets, home,
|
||||
"Downloads", sizeof(g_defaults.dir.core_assets));
|
||||
}
|
||||
else
|
||||
{
|
||||
fill_pathname_join(g_defaults.dir.screenshot, home,
|
||||
"retroArch/screenshots", sizeof(g_defaults.dir.screenshot));
|
||||
fill_pathname_join(g_defaults.dir.core_assets, home,
|
||||
"retroarch/downloads", sizeof(g_defaults.dir.core_assets));
|
||||
}
|
||||
fill_pathname_join(g_defaults.dir.core_assets, base_path,
|
||||
"downloads", sizeof(g_defaults.dir.core_assets));
|
||||
fill_pathname_join(g_defaults.dir.screenshot, base_path,
|
||||
"screenshots", sizeof(g_defaults.dir.screenshot));
|
||||
#endif
|
||||
}
|
||||
|
||||
|
@ -126,10 +126,17 @@ void main_exit(void *args)
|
||||
|
||||
static void check_defaults_dirs(void)
|
||||
{
|
||||
settings_t *settings = NULL;
|
||||
settings = config_get_ptr();
|
||||
|
||||
if (*g_defaults.dir.core_assets)
|
||||
path_mkdir(g_defaults.dir.core_assets);
|
||||
if (*g_defaults.dir.remap)
|
||||
path_mkdir(g_defaults.dir.remap);
|
||||
if (*g_defaults.dir.screenshot)
|
||||
path_mkdir(g_defaults.dir.screenshot);
|
||||
if (*g_defaults.dir.core)
|
||||
path_mkdir(g_defaults.dir.core);
|
||||
if (*g_defaults.dir.autoconfig)
|
||||
path_mkdir(g_defaults.dir.autoconfig);
|
||||
if (*g_defaults.dir.audio_filter)
|
||||
@ -242,8 +249,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);
|
||||
@ -263,6 +268,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…
x
Reference in New Issue
Block a user