Fixed infinite recursion initializing properties
This commit is contained in:
parent
979214363f
commit
407a3cb4e0
2 changed files with 3 additions and 10 deletions
|
@ -82,14 +82,6 @@ int SDL_InitProperties(void)
|
|||
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;
|
||||
}
|
||||
|
||||
|
@ -111,8 +103,8 @@ void SDL_QuitProperties(void)
|
|||
|
||||
SDL_PropertiesID SDL_GetGlobalProperties(void)
|
||||
{
|
||||
if (!SDL_properties && SDL_InitProperties() < 0) {
|
||||
return 0;
|
||||
if (!SDL_global_properties) {
|
||||
SDL_global_properties = SDL_CreateProperties();
|
||||
}
|
||||
return SDL_global_properties;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue