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

Merge pull request #10748 from tellowkrinkle/SDL22Fun 

InputCommon: SDL 2.0.22 init crash workaround
This commit is contained in:
JosJuice 2022-06-15 18:02:59 +02:00 committed by GitHub
parent f73b14bb01 994210e369
commit 107a928452
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats 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