From cb3662cc4d114db7bc580370dc3d89e58ee2af72 Mon Sep 17 00:00:00 2001 From: Andrew Griffiths Date: Fri, 3 Jan 2025 03:49:07 +1100 Subject: [PATCH] MacOS: fix for crash in SDL_Quit w/ gamepad input --- rpcs3/Input/sdl_pad_handler.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/rpcs3/Input/sdl_pad_handler.cpp b/rpcs3/Input/sdl_pad_handler.cpp index 28e10e285d..aaf95331f1 100644 --- a/rpcs3/Input/sdl_pad_handler.cpp +++ b/rpcs3/Input/sdl_pad_handler.cpp @@ -4,6 +4,7 @@ #include "sdl_pad_handler.h" #include "Emu/system_utils.hpp" #include "Emu/system_config.h" +#include "Emu/System.h" #include @@ -262,7 +263,14 @@ bool sdl_pad_handler::Init() if (m_is_init) 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; if (g_cfg.io.load_sdl_mappings)