From 4bc27194ddf56735a7c263235791a6afb6499afa Mon Sep 17 00:00:00 2001
From: AlexVinS <alexvins@mail.ru>
Date: Tue, 30 Aug 2016 03:43:49 +0300
Subject: [PATCH] do not leak screen surface etc. on quit

---
 client/CMT.cpp | 41 ++++++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/client/CMT.cpp b/client/CMT.cpp
index b1c00a609..d9f3cb95a 100644
--- a/client/CMT.cpp
+++ b/client/CMT.cpp
@@ -949,22 +949,8 @@ static bool checkVideoMode(int monitorIndex, int w, int h)
 	return false;
 }
 
-static bool recreateWindow(int w, int h, int bpp, bool fullscreen)
+static void cleanupRenderer()
 {
-	// VCMI will only work with 2 or 4 bytes per pixel
-	vstd::amax(bpp, 16);
-	vstd::amin(bpp, 32);
-	if(bpp>16)
-		bpp = 32;
-
-	if(!checkVideoMode(0,w,h))
-	{
-		logGlobal->errorStream() << "Error: SDL says that " << w << "x" << h << " resolution is not available!";
-		return false;
-	}
-
-	bool bufOnScreen = (screenBuf == screen);
-
 	screenBuf = nullptr; //it`s a link - just nullify
 
 	if(nullptr != screen2)
@@ -973,14 +959,12 @@ static bool recreateWindow(int w, int h, int bpp, bool fullscreen)
 		screen2 = nullptr;
 	}
 
-
 	if(nullptr != screen)
 	{
 		SDL_FreeSurface(screen);
 		screen = nullptr;
 	}
 
-
 	if(nullptr != screenTexture)
 	{
 		SDL_DestroyTexture(screenTexture);
@@ -998,7 +982,25 @@ static bool recreateWindow(int w, int h, int bpp, bool fullscreen)
 		SDL_DestroyWindow(mainWindow);
 		mainWindow = nullptr;
 	}
+}
 
+static bool recreateWindow(int w, int h, int bpp, bool fullscreen)
+{
+	// VCMI will only work with 2 or 4 bytes per pixel
+	vstd::amax(bpp, 16);
+	vstd::amin(bpp, 32);
+	if(bpp>16)
+		bpp = 32;
+
+	if(!checkVideoMode(0,w,h))
+	{
+		logGlobal->errorStream() << "Error: SDL says that " << w << "x" << h << " resolution is not available!";
+		return false;
+	}
+
+	bool bufOnScreen = (screenBuf == screen);
+
+	cleanupRenderer();
 
 	if(fullscreen)
 	{
@@ -1011,8 +1013,6 @@ static bool recreateWindow(int w, int h, int bpp, bool fullscreen)
 		mainWindow = SDL_CreateWindow(NAME.c_str(), SDL_WINDOWPOS_CENTERED,SDL_WINDOWPOS_CENTERED, w, h, 0);
 	}
 
-
-
 	if(nullptr == mainWindow)
 	{
 		throw std::runtime_error("Unable to create window\n");
@@ -1279,7 +1279,10 @@ void handleQuit(bool ask/* = true*/)
 		vstd::clear_pointer(console);
 		boost::this_thread::sleep(boost::posix_time::milliseconds(750));
 		if(!gNoGUI)
+		{
+			cleanupRenderer();
 			SDL_Quit();
+		}
 
 		std::cout << "Ending...\n";
 		exit(0);