piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-22 22:00:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

InputCommon: SDL 2.0.22 init crash workaround

Browse Source 
See https://github.com/libsdl-org/SDL/pull/5598
This commit is contained in:
TellowKrinkle
2022-05-30 19:46:05 -05:00
parent 70bf89fa59
commit 994210e369
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp
View File

@ -83,6 +83,11 @@ void Init()
ERROR_LOG_FMT(CONTROLLERINTERFACE, "SDL failed to initialize"); ERROR_LOG_FMT(CONTROLLERINTERFACE, "SDL failed to initialize");
return; return;
#else #else
#if defined(__APPLE__) && !SDL_VERSION_ATLEAST(2, 0, 24)
// Bug in SDL 2.0.22 requires the first init to be done on the main thread to avoid crashing
SDL_InitSubSystem(SDL_INIT_JOYSTICK);
SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
#endif
s_hotplug_thread = std::thread([] { s_hotplug_thread = std::thread([] {
Common::ScopeGuard quit_guard([] { Common::ScopeGuard quit_guard([] {
// TODO: there seems to be some sort of memory leak with SDL, quit isn't freeing everything up // TODO: there seems to be some sort of memory leak with SDL, quit isn't freeing everything up