mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 22:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Menu) Fix crash when we select 'Core Disk Options' and then

Browse Source 
select 'Close Content'
This commit is contained in:
twinaphex 2015-06-25 15:25:08 +02:00
parent 41d4eacd56
commit 1326d57e2b
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
menu/cbs/menu_cbs_get_value.c
View File

@ -540,8 +540,12 @@ static void menu_action_setting_disp_set_label_menu_disk_index(
{
unsigned images = 0, current = 0;
rarch_system_info_t *system = rarch_system_info_get_ptr();
struct retro_disk_control_callback *control =
system ? &system->disk_control : NULL;
struct retro_disk_control_callback *control = NULL;
if (!system)
return;
control = &system->disk_control;
if (!control)
return;
@ -550,8 +554,13 @@ static void menu_action_setting_disp_set_label_menu_disk_index(
*s = '\0';
strlcpy(s2, path, len2);
images = control ? control->get_num_images() : 0;
current = control ? control->get_image_index() : 0;
if (!control->get_num_images)
return;
if (!control->get_image_index)
return;
images = control->get_num_images();
current = control->get_image_index();
if (current >= images)
strlcpy(s, menu_hash_to_str(MENU_VALUE_NO_DISK), len);