From 468309d06c7ac3e3278057cfb1cfc19b332833bf Mon Sep 17 00:00:00 2001 From: Ahmad Fatoum Date: Fri, 9 Feb 2018 22:50:50 +0100 Subject: [PATCH] Early-exit InitWindow if InitGraphicsDevice fails 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. --- src/core.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/core.c b/src/core.c index 0a1c34c9a..d6a109431 100644 --- a/src/core.c +++ b/src/core.c @@ -441,12 +441,13 @@ void InitWindow(int width, int height, void *data) uwpWindow = (EGLNativeWindowType)data; #endif + // Init hi-res timer + InitTimer(); + // Init graphics device (display device and OpenGL context) // NOTE: returns true if window and graphic device has been initialized successfully windowReady = InitGraphicsDevice(width, height); - - // Init hi-res timer - InitTimer(); + if (!windowReady) return; #if defined(SUPPORT_DEFAULT_FONT) // Load default font