mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-06 09:40:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

consoles: only use libretro_path for libretro_directory if it isn't empty

Browse Source
This commit is contained in:
Brad Parker 2017-10-01 01:17:45 -04:00
parent 7a6d2cb5e6
commit bdad323b96
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
configuration.c
View File

@ -2603,14 +2603,21 @@ static bool config_load_file(const char *path, bool set_defaults,
} }
} }
/* Safe-guard against older behavior. */ #ifdef RARCH_CONSOLE
if (path_is_directory(path_get(RARCH_PATH_CORE))) if (!string_is_empty(path_get(RARCH_PATH_CORE)))
{ {
RARCH_WARN("\"libretro_path\" is a directory, using this for \"libretro_directory\" instead.\n"); #endif
strlcpy(settings->paths.directory_libretro, path_get(RARCH_PATH_CORE), /* Safe-guard against older behavior. */
sizeof(settings->paths.directory_libretro)); if (path_is_directory(path_get(RARCH_PATH_CORE)))
path_clear(RARCH_PATH_CORE); {
RARCH_WARN("\"libretro_path\" is a directory, using this for \"libretro_directory\" instead.\n");
strlcpy(settings->paths.directory_libretro, path_get(RARCH_PATH_CORE),
sizeof(settings->paths.directory_libretro));
path_clear(RARCH_PATH_CORE);
}
#ifdef RARCH_CONSOLE
} }
#endif
if (string_is_equal_fast(settings->paths.path_menu_wallpaper, "default", 7)) if (string_is_equal_fast(settings->paths.path_menu_wallpaper, "default", 7))
*settings->paths.path_menu_wallpaper = '\0'; *settings->paths.path_menu_wallpaper = '\0';