mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-02-06 00:40:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

MacOS: fix for crash in SDL_Quit w/ gamepad input

Browse Source
This commit is contained in:
Andrew Griffiths 2025-01-03 03:49:07 +11:00 committed by Megamouse
parent fb237dd568
commit cb3662cc4d
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rpcs3/Input/sdl_pad_handler.cpp
View File

@ -4,6 +4,7 @@
#include "sdl_pad_handler.h" #include "sdl_pad_handler.h"
#include "Emu/system_utils.hpp" #include "Emu/system_utils.hpp"
#include "Emu/system_config.h" #include "Emu/system_config.h"
#include "Emu/System.h"
#include <mutex> #include <mutex>
@ -262,7 +263,14 @@ bool sdl_pad_handler::Init()
if (m_is_init) if (m_is_init)
return true; return true;
if (!sdl_instance::get_instance().initialize()) bool instance_success;
Emu.BlockingCallFromMainThread([&instance_success]()
{
instance_success = sdl_instance::get_instance().initialize();
});
if (!instance_success)
return false; return false;
if (g_cfg.io.load_sdl_mappings) if (g_cfg.io.load_sdl_mappings)