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

Start decoupling joypad destruction from input driver destruction

Browse Source
This commit is contained in:
twinaphex 2020-09-05 08:56:28 +02:00
parent aa95de57db
commit 32d075df79
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
retroarch.c
View File

@ -31496,21 +31496,17 @@ static void video_driver_free_internal(void)
if (!(p_rarch->current_input_data == p_rarch->video_driver_data))
{
if (p_rarch->current_input)
{
if (p_rarch->current_input->free)
{
p_rarch->current_input->free(p_rarch->current_input_data);
if (p_rarch->joypad)
p_rarch->joypad->destroy();
if (p_rarch->joypad)
p_rarch->joypad->destroy();
p_rarch->joypad = NULL;
#ifdef HAVE_MFI
if (p_rarch->sec_joypad)
p_rarch->sec_joypad->destroy();
p_rarch->sec_joypad = NULL;
if (p_rarch->sec_joypad)
p_rarch->sec_joypad->destroy();
p_rarch->sec_joypad = NULL;
#endif
p_rarch->joypad = NULL;
}
p_rarch->keyboard_mapping_blocked = false;
}
p_rarch->keyboard_mapping_blocked = false;
p_rarch->current_input_data = NULL;
}