- if (window->Window.pContext.eglSurface != EGL_NO_SURFACE) {
- eglDestroySurface(fgDisplay.pDisplay.eglDisplay, window->Window.pContext.eglSurface);
- window->Window.pContext.eglSurface = EGL_NO_SURFACE;
+ eglMakeCurrent(fgDisplay.pDisplay.egl.Display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+ if (window->Window.Context != EGL_NO_CONTEXT) {
+ eglDestroyContext(fgDisplay.pDisplay.egl.Display, window->Window.Context);
+ window->Window.Context = EGL_NO_CONTEXT;
+ }
+
+ if (window->Window.pContext.egl.Surface != EGL_NO_SURFACE) {
+ eglDestroySurface(fgDisplay.pDisplay.egl.Display, window->Window.pContext.egl.Surface);
+ window->Window.pContext.egl.Surface = EGL_NO_SURFACE;