geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed infinite recursion initializing properties

main
Sam Lantinga 2023-11-08 12:38:04 -08:00
parent 979214363f
commit 407a3cb4e0
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/SDL.c
View File

@ -185,6 +185,7 @@ int SDL_InitSubSystem(Uint32 flags)
SDL_InitLog(); SDL_InitLog();
SDL_InitProperties(); SDL_InitProperties();
SDL_GetGlobalProperties();
/* Clear the error message */ /* Clear the error message */
SDL_ClearError(); SDL_ClearError();

12
src/SDL_properties.c
View File

@ -82,14 +82,6 @@ int SDL_InitProperties(void)
return -1; return -1;
} }
} }
/* Create the global properties here to avoid race conditions later */
if (!SDL_global_properties) {
SDL_global_properties = SDL_CreateProperties();
if (!SDL_global_properties) {
return -1;
}
}
return 0; return 0;
} }
@ -111,8 +103,8 @@ void SDL_QuitProperties(void)
SDL_PropertiesID SDL_GetGlobalProperties(void) SDL_PropertiesID SDL_GetGlobalProperties(void)
{ {
if (!SDL_properties && SDL_InitProperties() < 0) { if (!SDL_global_properties) {
return 0; SDL_global_properties = SDL_CreateProperties();
} }
return SDL_global_properties; return SDL_global_properties;
} }