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

Fix crash when loading from playlist

This commit is contained in:
twinaphex 2016-01-26 01:24:26 +01:00
parent d8f0df794d
commit 5aca126ffe
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
menu/cbs/menu_cbs_ok.c
View File

@ -436,7 +436,7 @@ static int rarch_defer_core_wrapper(size_t idx, size_t entry_idx,
menu_path_new, path, menu_label, menu->deferred_path, menu_path_new, path, menu_label, menu->deferred_path,
sizeof(menu->deferred_path)); sizeof(menu->deferred_path));
if (!is_carchive) if (!is_carchive && !string_is_empty(path) && !string_is_empty(menu_path_new))
fill_pathname_join(detect_content_path, menu_path_new, path, fill_pathname_join(detect_content_path, menu_path_new, path,
sizeof(detect_content_path)); sizeof(detect_content_path));

3
menu/menu_content.c
View File

@ -227,7 +227,8 @@ int menu_content_defer_core(void *data, const char *dir,
core_info_list_t *core_info = (core_info_list_t*)data; core_info_list_t *core_info = (core_info_list_t*)data;
uint32_t menu_label_hash = menu_hash_calculate(menu_label); uint32_t menu_label_hash = menu_hash_calculate(menu_label);
fill_pathname_join(s, dir, path, len); if (!string_is_empty(dir) && !string_is_empty(path))
fill_pathname_join(s, dir, path, len);
#ifdef HAVE_COMPRESSION #ifdef HAVE_COMPRESSION
if (path_is_compressed_file(dir)) if (path_is_compressed_file(dir))