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

Be similarly careful in other functions

This commit is contained in:
twinaphex 2017-09-28 03:39:35 +02:00
parent 8b62a7cb7d
commit 8af2559b2a
1 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
menu/cbs/menu_cbs_ok.c
View File

@ -1384,7 +1384,8 @@ static int action_ok_file_load(const char *path,
menu_entries_get_last(menu_stack, &menu_path, &menu_label, NULL, NULL); menu_entries_get_last(menu_stack, &menu_path, &menu_label, NULL, NULL);
setting = menu_setting_find(menu_label); if (menu_label && !string_is_empty(menu_label))
setting = menu_setting_find(menu_label);
if (setting_get_type(setting) == ST_PATH) if (setting_get_type(setting) == ST_PATH)
return action_ok_set_path(path, label, type, idx, entry_idx); return action_ok_set_path(path, label, type, idx, entry_idx);
@ -1392,20 +1393,23 @@ static int action_ok_file_load(const char *path,
if (menu_path && !string_is_empty(menu_path)) if (menu_path && !string_is_empty(menu_path))
strlcpy(menu_path_new, menu_path, sizeof(menu_path_new)); strlcpy(menu_path_new, menu_path, sizeof(menu_path_new));
if ( if (menu_label && !string_is_empty(menu_label))
string_is_equal(menu_label,
msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_ARCHIVE_OPEN_DETECT_CORE)) ||
string_is_equal(menu_label,
msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_ARCHIVE_OPEN))
)
{ {
menu_handle_t *menu = NULL; if (
if (!menu_driver_ctl(RARCH_MENU_CTL_DRIVER_DATA_GET, &menu)) string_is_equal(menu_label,
return menu_cbs_exit(); msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_ARCHIVE_OPEN_DETECT_CORE)) ||
string_is_equal(menu_label,
msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_ARCHIVE_OPEN))
)
{
menu_handle_t *menu = NULL;
if (!menu_driver_ctl(RARCH_MENU_CTL_DRIVER_DATA_GET, &menu))
return menu_cbs_exit();
fill_pathname_join(menu_path_new, fill_pathname_join(menu_path_new,
menu->scratch2_buf, menu->scratch_buf, menu->scratch2_buf, menu->scratch_buf,
sizeof(menu_path_new)); sizeof(menu_path_new));
}
} }
switch (type) switch (type)
@ -2420,8 +2424,9 @@ static int action_ok_file_load_ffmpeg(const char *path,
content_info.args = NULL; content_info.args = NULL;
content_info.environ_get = NULL; content_info.environ_get = NULL;
fill_pathname_join(new_path, menu_path, path, if (menu_path && !string_is_empty(menu_path))
sizeof(new_path)); fill_pathname_join(new_path, menu_path, path,
sizeof(new_path));
if (!task_push_load_content_with_core_from_menu( if (!task_push_load_content_with_core_from_menu(
new_path, new_path,
@ -2480,8 +2485,9 @@ static int action_ok_file_load_imageviewer(const char *path,
content_info.args = NULL; content_info.args = NULL;
content_info.environ_get = NULL; content_info.environ_get = NULL;
fill_pathname_join(fullpath, menu_path, path, if (menu_path && !string_is_empty(menu_path))
sizeof(fullpath)); fill_pathname_join(fullpath, menu_path, path,
sizeof(fullpath));
if (!task_push_load_content_with_core_from_menu( if (!task_push_load_content_with_core_from_menu(
fullpath, fullpath,
@ -3005,7 +3011,6 @@ static int action_ok_core_content_download(const char *path,
menu_entries_get_last_stack(&menu_path, &menu_label, NULL, &enum_idx, NULL); menu_entries_get_last_stack(&menu_path, &menu_label, NULL, &enum_idx, NULL);
return action_ok_download_generic(path, label, return action_ok_download_generic(path, label,
menu_path, type, idx, entry_idx, menu_path, type, idx, entry_idx,
MENU_ENUM_LABEL_CB_CORE_CONTENT_DOWNLOAD); MENU_ENUM_LABEL_CB_CORE_CONTENT_DOWNLOAD);