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

Fix crash when cores using RETRO_ENVIRONMENT_SET_AUDIO_CALLBACK return false from retro_load_game() (#13547)

This commit is contained in:
jdgleaver 2022-01-26 17:30:07 +00:00 committed by GitHub
parent dfcbde86f7
commit fa213a724f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
retroarch.c
View File

@ -2360,9 +2360,10 @@ bool command_event(enum event_command cmd, void *data)
} }
case CMD_EVENT_CORE_INIT: case CMD_EVENT_CORE_INIT:
{ {
enum rarch_core_type *type = (enum rarch_core_type*)data; enum rarch_core_type *type = (enum rarch_core_type*)data;
rarch_system_info_t *sys_info = &runloop_st->system; rarch_system_info_t *sys_info = &runloop_st->system;
input_driver_state_t *input_st= input_state_get_ptr(); input_driver_state_t *input_st = input_state_get_ptr();
audio_driver_state_t *audio_st = audio_state_get_ptr();
content_reset_savestate_backups(); content_reset_savestate_backups();
@ -2370,8 +2371,19 @@ bool command_event(enum event_command cmd, void *data)
if (sys_info) if (sys_info)
disk_control_set_ext_callback(&sys_info->disk_control, NULL); disk_control_set_ext_callback(&sys_info->disk_control, NULL);
/* Ensure that audio callback interface is reset */
audio_st->callback.callback = NULL;
audio_st->callback.set_state = NULL;
if (!type || !runloop_event_init_core(settings, input_st, *type)) if (!type || !runloop_event_init_core(settings, input_st, *type))
{
/* If core failed to initialise, audio callback
* interface may be assigned invalid function
* pointers -> ensure it is reset */
audio_st->callback.callback = NULL;
audio_st->callback.set_state = NULL;
return false; return false;
}
} }
break; break;
case CMD_EVENT_VIDEO_APPLY_STATE_CHANGES: case CMD_EVENT_VIDEO_APPLY_STATE_CHANGES: