UnrealXR/raylib
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Early-exit InitWindow if InitGraphicsDevice fails

Browse source 
Otherwise we may run into LoadDefaultFont and crash in rlLoadTexture
Also moves InitTimer() before InitGraphicsDevice(), to allow it to be
tested even if InitWindow ultimately fails.
This commit is contained in:
Ahmad Fatoum 2018-02-09 22:50:50 +01:00
parent f72b315cb6
commit 468309d06c
No known key found for this signature in database
GPG key ID: C3EAC3DE9321D59B
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/core.c
View file

@ -441,12 +441,13 @@ void InitWindow(int width, int height, void *data)
uwpWindow = (EGLNativeWindowType)data; uwpWindow = (EGLNativeWindowType)data;
#endif #endif
// Init hi-res timer
InitTimer();
// Init graphics device (display device and OpenGL context) // Init graphics device (display device and OpenGL context)
// NOTE: returns true if window and graphic device has been initialized successfully // NOTE: returns true if window and graphic device has been initialized successfully
windowReady = InitGraphicsDevice(width, height); windowReady = InitGraphicsDevice(width, height);
if (!windowReady) return;
// Init hi-res timer
InitTimer();
#if defined(SUPPORT_DEFAULT_FONT) #if defined(SUPPORT_DEFAULT_FONT)
// Load default font // Load default font