ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Redirect some defaults to g_defaults instead of "" string.

This commit is contained in:
Themaister 2014-06-20 12:09:16 +02:00
parent 636fdf95b6
commit 67917bd1d8
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/menu/backend/menu_common_backend.c
View File

@ -4165,17 +4165,17 @@ static int menu_common_setting_set(unsigned setting, unsigned action)
#endif #endif
case MENU_SAVEFILE_DIR_PATH: case MENU_SAVEFILE_DIR_PATH:
if (action == MENU_ACTION_START) if (action == MENU_ACTION_START)
*g_extern.savefile_dir = '\0'; strlcpy(g_extern.savefile_dir, g_defaults.sram_dir, sizeof(g_extern.savefile_dir));
break; break;
#ifdef HAVE_OVERLAY #ifdef HAVE_OVERLAY
case MENU_OVERLAY_DIR_PATH: case MENU_OVERLAY_DIR_PATH:
if (action == MENU_ACTION_START) if (action == MENU_ACTION_START)
*g_extern.overlay_dir = '\0'; strlcpy(g_extern.overlay_dir, g_defaults.overlay_dir, sizeof(g_extern.overlay_dir));
break; break;
#endif #endif
case MENU_SAVESTATE_DIR_PATH: case MENU_SAVESTATE_DIR_PATH:
if (action == MENU_ACTION_START) if (action == MENU_ACTION_START)
*g_extern.savestate_dir = '\0'; strlcpy(g_extern.savestate_dir, g_defaults.savestate_dir, sizeof(g_extern.savestate_dir));
break; break;
case MENU_LIBRETRO_DIR_PATH: case MENU_LIBRETRO_DIR_PATH:
if (action == MENU_ACTION_START) if (action == MENU_ACTION_START)

2
frontend/platform/platform_android.c
View File

@ -574,8 +574,6 @@ static void frontend_android_get_environment_settings(int *argc, char *argv[],
fill_pathname_join(g_defaults.savestate_dir, path, "savestates", sizeof(g_defaults.savestate_dir)); fill_pathname_join(g_defaults.savestate_dir, path, "savestates", sizeof(g_defaults.savestate_dir));
fill_pathname_join(g_defaults.sram_dir, path, "savefiles", sizeof(g_defaults.sram_dir)); fill_pathname_join(g_defaults.sram_dir, path, "savefiles", sizeof(g_defaults.sram_dir));
fill_pathname_join(g_defaults.system_dir, path, "system", sizeof(g_defaults.system_dir)); fill_pathname_join(g_defaults.system_dir, path, "system", sizeof(g_defaults.system_dir));
args->sram_path = g_defaults.sram_dir;
args->state_path = g_defaults.savestate_dir;
} }
} }
} }

4
settings.c
View File

@ -1116,7 +1116,7 @@ bool config_load_file(const char *path, bool set_defaults)
if (!g_extern.has_set_save_path && config_get_path(conf, "savefile_directory", tmp_str, sizeof(tmp_str))) if (!g_extern.has_set_save_path && config_get_path(conf, "savefile_directory", tmp_str, sizeof(tmp_str)))
{ {
if (!strcmp(tmp_str, "default")) if (!strcmp(tmp_str, "default"))
*g_extern.savefile_dir = '\0'; strlcpy(g_extern.savefile_dir, g_defaults.sram_dir, sizeof(g_extern.savefile_dir));
else if (path_is_directory(tmp_str)) else if (path_is_directory(tmp_str))
{ {
strlcpy(g_extern.savefile_dir, tmp_str, sizeof(g_extern.savefile_dir)); strlcpy(g_extern.savefile_dir, tmp_str, sizeof(g_extern.savefile_dir));
@ -1130,7 +1130,7 @@ bool config_load_file(const char *path, bool set_defaults)
if (!g_extern.has_set_state_path && config_get_path(conf, "savestate_directory", tmp_str, sizeof(tmp_str))) if (!g_extern.has_set_state_path && config_get_path(conf, "savestate_directory", tmp_str, sizeof(tmp_str)))
{ {
if (!strcmp(tmp_str, "default")) if (!strcmp(tmp_str, "default"))
*g_extern.savestate_dir = '\0'; strlcpy(g_extern.savestate_dir, g_defaults.savestate_dir, sizeof(g_extern.savestate_dir));
else if (path_is_directory(tmp_str)) else if (path_is_directory(tmp_str))
{ {
strlcpy(g_extern.savestate_dir, tmp_str, sizeof(g_extern.savestate_dir)); strlcpy(g_extern.savestate_dir, tmp_str, sizeof(g_extern.savestate_dir));