From 756a9bf2143fb79c786a275ce3c780f3ab6fc99d Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 28 Jan 2015 09:29:11 +0100 Subject: [PATCH] (Android) Add default path for extraction_directory on Android - needed now ever since increased limitations on SD external storage --- frontend/drivers/platform_android.c | 2 ++ frontend/frontend.c | 2 ++ general.h | 1 + settings.c | 3 +++ 4 files changed, 8 insertions(+) diff --git a/frontend/drivers/platform_android.c b/frontend/drivers/platform_android.c index 07a560c53e..61a121547b 100644 --- a/frontend/drivers/platform_android.c +++ b/frontend/drivers/platform_android.c @@ -642,6 +642,8 @@ static void frontend_android_get_environment_settings(int *argc, "assets", sizeof(g_defaults.savestate_dir)); fill_pathname_join(g_defaults.savestate_dir, path, "savestates", sizeof(g_defaults.savestate_dir)); + fill_pathname_join(g_defaults.extraction_dir, path, + "tmp", sizeof(g_defaults.extraction_dir)); fill_pathname_join(g_defaults.sram_dir, path, "savefiles", sizeof(g_defaults.sram_dir)); fill_pathname_join(g_defaults.system_dir, path, diff --git a/frontend/frontend.c b/frontend/frontend.c index 0e212550d8..0c0f1ba8b7 100644 --- a/frontend/frontend.c +++ b/frontend/frontend.c @@ -151,6 +151,8 @@ static void check_defaults_dirs(void) path_mkdir(g_defaults.menu_config_dir); if (*g_defaults.content_history_dir) path_mkdir(g_defaults.content_history_dir); + if (*g_defaults.extraction_dir) + path_mkdir(g_defaults.extraction_dir); } static void history_playlist_push(content_playlist_t *playlist, diff --git a/general.h b/general.h index a1973fa9f3..c909052ffa 100644 --- a/general.h +++ b/general.h @@ -114,6 +114,7 @@ struct defaults char system_dir[PATH_MAX_LENGTH]; char playlist_dir[PATH_MAX_LENGTH]; char content_history_dir[PATH_MAX_LENGTH]; + char extraction_dir[PATH_MAX_LENGTH]; struct { diff --git a/settings.c b/settings.c index a4668cc927..d4529898ad 100644 --- a/settings.c +++ b/settings.c @@ -642,6 +642,9 @@ static void config_set_defaults(void) g_extern.console.sound.mode = SOUND_MODE_NORMAL; #endif + if (*g_defaults.extraction_dir) + strlcpy(g_settings.extraction_directory, + g_defaults.extraction_dir, sizeof(g_settings.extraction_directory)); if (*g_defaults.audio_filter_dir) strlcpy(g_settings.audio.filter_dir, g_defaults.audio_filter_dir, sizeof(g_settings.audio.filter_dir));