egl: make sure display is valid before cleanup

scribam · Dec 12, 2023 · 6abf895 · 6abf895
1 parent 0433fd8
commit 6abf895
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/core/wsi/egl.cpp b/core/wsi/egl.cpp
@@ -164,13 +164,19 @@ bool EGLGraphicsContext::init()
 void EGLGraphicsContext::term()
 {
 	preTerm();
-	eglMakeCurrent(display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
-	if (context != EGL_NO_CONTEXT)
-		eglDestroyContext(display, context);
-	if (surface != EGL_NO_SURFACE)
-		eglDestroySurface(display, surface);
+
 	if (display != EGL_NO_DISPLAY)
+	{
+		eglMakeCurrent(display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+
+		if (context != EGL_NO_CONTEXT)
+			eglDestroyContext(display, context);
+
+		if (surface != EGL_NO_SURFACE)
+			eglDestroySurface(display, surface);
+
 		eglTerminate(display);
+	}
 
 	context = EGL_NO_CONTEXT;
 	surface = EGL_NO_SURFACE;