Mirrors_Framework/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-05-27 19:19:41 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Fixed cleaning up dependent subsystems if initialization fails

Browse Source
This commit is contained in:
Sam Lantinga
2024-09-15 11:40:31 -07:00
parent 97d40b9218
commit 5b5b1a8926
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/SDL.c
+5
View File
@@ -333,6 +333,7 @@ SDL_bool SDL_InitSubSystem(SDL_InitFlags flags)
SDL_IncrementSubsystemRefCount(SDL_INIT_VIDEO); SDL_IncrementSubsystemRefCount(SDL_INIT_VIDEO);
if (!SDL_VideoInit(NULL)) { if (!SDL_VideoInit(NULL)) {
SDL_DecrementSubsystemRefCount(SDL_INIT_VIDEO); SDL_DecrementSubsystemRefCount(SDL_INIT_VIDEO);
SDL_QuitSubSystem(SDL_INIT_EVENTS);
goto quit_and_error; goto quit_and_error;
} }
} else { } else {
@@ -357,6 +358,7 @@ SDL_bool SDL_InitSubSystem(SDL_InitFlags flags)
SDL_IncrementSubsystemRefCount(SDL_INIT_AUDIO); SDL_IncrementSubsystemRefCount(SDL_INIT_AUDIO);
if (!SDL_InitAudio(NULL)) { if (!SDL_InitAudio(NULL)) {
SDL_DecrementSubsystemRefCount(SDL_INIT_AUDIO); SDL_DecrementSubsystemRefCount(SDL_INIT_AUDIO);
SDL_QuitSubSystem(SDL_INIT_EVENTS);
goto quit_and_error; goto quit_and_error;
} }
} else { } else {
@@ -381,6 +383,7 @@ SDL_bool SDL_InitSubSystem(SDL_InitFlags flags)
SDL_IncrementSubsystemRefCount(SDL_INIT_JOYSTICK); SDL_IncrementSubsystemRefCount(SDL_INIT_JOYSTICK);
if (!SDL_InitJoysticks()) { if (!SDL_InitJoysticks()) {
SDL_DecrementSubsystemRefCount(SDL_INIT_JOYSTICK); SDL_DecrementSubsystemRefCount(SDL_INIT_JOYSTICK);
SDL_QuitSubSystem(SDL_INIT_EVENTS);
goto quit_and_error; goto quit_and_error;
} }
} else { } else {
@@ -404,6 +407,7 @@ SDL_bool SDL_InitSubSystem(SDL_InitFlags flags)
SDL_IncrementSubsystemRefCount(SDL_INIT_GAMEPAD); SDL_IncrementSubsystemRefCount(SDL_INIT_GAMEPAD);
if (!SDL_InitGamepads()) { if (!SDL_InitGamepads()) {
SDL_DecrementSubsystemRefCount(SDL_INIT_GAMEPAD); SDL_DecrementSubsystemRefCount(SDL_INIT_GAMEPAD);
SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
goto quit_and_error; goto quit_and_error;
} }
} else { } else {
@@ -466,6 +470,7 @@ SDL_bool SDL_InitSubSystem(SDL_InitFlags flags)
SDL_IncrementSubsystemRefCount(SDL_INIT_CAMERA); SDL_IncrementSubsystemRefCount(SDL_INIT_CAMERA);
if (!SDL_CameraInit(NULL)) { if (!SDL_CameraInit(NULL)) {
SDL_DecrementSubsystemRefCount(SDL_INIT_CAMERA); SDL_DecrementSubsystemRefCount(SDL_INIT_CAMERA);
SDL_QuitSubSystem(SDL_INIT_EVENTS);
goto quit_and_error; goto quit_and_error;
} }
} else { } else {