From d1b6556bd125f52744ff12b8dd2e644a1515205f Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 17 Jul 2017 19:27:22 +0300
Subject: Do actual SDL2 graphics cleanup before exit.

---
 src/render/graphics.cpp | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

(limited to 'src/render/graphics.cpp')

diff --git a/src/render/graphics.cpp b/src/render/graphics.cpp
index 92a9acc36..82a4cbfd6 100644
--- a/src/render/graphics.cpp
+++ b/src/render/graphics.cpp
@@ -107,6 +107,18 @@ RENDER_OPENGL_MGLDEFINES_H
 
 Graphics *mainGraphics A_NONNULLPOINTER = nullptr;
 
+#ifdef USE_SDL2
+SDL_Renderer *restrict Graphics::mRenderer = nullptr;
+#endif  // USE_SDL2
+#ifdef USE_OPENGL
+#ifdef USE_SDL2
+SDL_GLContext Graphics::mGLContext = nullptr;
+#else  // USE_SDL2
+
+void *restrict Graphics::mGLContext = nullptr;
+#endif  // USE_SDL2
+#endif  // USE_OPENGL
+
 Graphics::Graphics() :
     mWidth(0),
     mHeight(0),
@@ -114,12 +126,6 @@ Graphics::Graphics() :
     mActualHeight(0),
     mClipStack(1000),
     mWindow(nullptr),
-#ifdef USE_SDL2
-    mRenderer(nullptr),
-#endif  // USE_SDL2
-#ifdef USE_OPENGL
-    mGLContext(nullptr),
-#endif  // USE_OPENGL
     mBpp(0),
     mAlpha(false),
     mFullscreen(false),
@@ -146,6 +152,10 @@ Graphics::Graphics() :
 Graphics::~Graphics()
 {
     endDraw();
+}
+
+void Graphics::cleanUp()
+{
 #ifdef USE_SDL2
     if (mRenderer)
     {
-- 
cgit v1.2.3-70-g09d2