From 8556fe08f51cee36357862ec0ebf7df5a99b2425 Mon Sep 17 00:00:00 2001 From: radius Date: Sat, 3 Oct 2015 11:10:00 -0500 Subject: [PATCH 1/5] fix some nits --- frontend/frontend.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/frontend.c b/frontend/frontend.c index 13a4f78d74..cab28bd9ee 100644 --- a/frontend/frontend.c +++ b/frontend/frontend.c @@ -50,7 +50,7 @@ void main_exit_save_config(void) sizeof(global->dir.savestate)); /* Save last core-specific config to the default config location, - * needed on consoles for core switching and reusing last good + * needed on consoles for core switching and reusing last good * config for new cores. */ config_save_file(global->path.config); @@ -279,7 +279,7 @@ error: * Main function of RetroArch. * * If HAVE_MAIN is not defined, will contain main loop and will not - * be exited from until we exit the program. Otherwise, will + * be exited from until we exit the program. Otherwise, will * just do initialization. * * Returns: varies per platform. @@ -344,7 +344,7 @@ int rarch_main(int argc, char *argv[], void *data) do{ unsigned sleep_ms = 0; ret = rarch_main_iterate(&sleep_ms); - + if (ret == 1 && sleep_ms > 0) retro_sleep(sleep_ms); rarch_main_data_iterate(); From 13f2cce9a1f9abec5ff5487ef6c98f380e14e522 Mon Sep 17 00:00:00 2001 From: radius Date: Sat, 3 Oct 2015 11:10:36 -0500 Subject: [PATCH 2/5] check for default dirs after loading config --- frontend/frontend.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/frontend.c b/frontend/frontend.c index cab28bd9ee..5c4f22770a 100644 --- a/frontend/frontend.c +++ b/frontend/frontend.c @@ -242,8 +242,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 +261,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); From 1f52b81a28d58d240de1b581d460490301582734 Mon Sep 17 00:00:00 2001 From: radius Date: Sat, 3 Oct 2015 11:24:17 -0500 Subject: [PATCH 3/5] add screenshot dir --- frontend/frontend.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/frontend/frontend.c b/frontend/frontend.c index 5c4f22770a..476bfc5772 100644 --- a/frontend/frontend.c +++ b/frontend/frontend.c @@ -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) From 300617b19045165dac6f39094efedc2be43a395b Mon Sep 17 00:00:00 2001 From: radius Date: Sat, 3 Oct 2015 11:24:44 -0500 Subject: [PATCH 4/5] set defaults always to XDG dirs --- frontend/drivers/platform_linux.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/frontend/drivers/platform_linux.c b/frontend/drivers/platform_linux.c index a36edf1f04..729de041ec 100644 --- a/frontend/drivers/platform_linux.c +++ b/frontend/drivers/platform_linux.c @@ -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_directory, base_path, + "downloads", sizeof(g_defaults.dir.core_assets_directory)); + fill_pathname_join(g_defaults.dir.screenshot, base_path, + "screenshots", sizeof(g_defaults.dir.screenshot)); #endif } From a92dfd4668b081403187d32f87ee002bc4eae29d Mon Sep 17 00:00:00 2001 From: radius Date: Sat, 3 Oct 2015 11:30:13 -0500 Subject: [PATCH 5/5] fix downloads dir --- frontend/drivers/platform_linux.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/drivers/platform_linux.c b/frontend/drivers/platform_linux.c index 729de041ec..00a660ffd6 100644 --- a/frontend/drivers/platform_linux.c +++ b/frontend/drivers/platform_linux.c @@ -1976,8 +1976,8 @@ 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)); - fill_pathname_join(g_defaults.dir.core_assets_directory, base_path, - "downloads", sizeof(g_defaults.dir.core_assets_directory)); + 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