encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

WGI: Only call RoUninitialize() if RoInitialize() succeeded

This commit is contained in:
Cameron Gutman 2022-04-21 01:38:53 -05:00 committed by Sam Lantinga
parent 00b2e10a7a
commit 145824f6ab
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/joystick/windows/SDL_windows_gaming_input.c
View File

@ -68,6 +68,7 @@ static struct {
EventRegistrationToken controller_added_token; EventRegistrationToken controller_added_token;
EventRegistrationToken controller_removed_token; EventRegistrationToken controller_removed_token;
int controller_count; int controller_count;
SDL_bool ro_initialized;
WindowsGamingInputControllerState *controllers; WindowsGamingInputControllerState *controllers;
} wgi; } wgi;
@ -443,6 +444,7 @@ WGI_JoystickInit(void)
if (FAILED(WIN_RoInitialize())) { if (FAILED(WIN_RoInitialize())) {
return SDL_SetError("RoInitialize() failed"); return SDL_SetError("RoInitialize() failed");
} }
wgi.ro_initialized = SDL_TRUE;
#ifndef __WINRT__ #ifndef __WINRT__
{ {
@ -871,9 +873,12 @@ WGI_JoystickQuit(void)
__x_ABI_CWindows_CGaming_CInput_CIRawGameControllerStatics_remove_RawGameControllerRemoved(wgi.statics, wgi.controller_removed_token); __x_ABI_CWindows_CGaming_CInput_CIRawGameControllerStatics_remove_RawGameControllerRemoved(wgi.statics, wgi.controller_removed_token);
__x_ABI_CWindows_CGaming_CInput_CIRawGameControllerStatics_Release(wgi.statics); __x_ABI_CWindows_CGaming_CInput_CIRawGameControllerStatics_Release(wgi.statics);
} }
SDL_zero(wgi);
WIN_RoUninitialize(); if (wgi.ro_initialized) {
WIN_RoUninitialize();
}
SDL_zero(wgi);
} }
static SDL_bool static SDL_bool