From 449d2c182effbd5357c84a6156091dcbef7c9492 Mon Sep 17 00:00:00 2001
From: D-AIRY <admin@ds-servers.com>
Date: Tue, 30 Jun 2020 12:40:54 +0300
Subject: [PATCH] Unload level before shutdown bug#553

---
 source/game/GameData.cpp | 2 ++
 source/terrax/terrax.cpp | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/source/game/GameData.cpp b/source/game/GameData.cpp
index 2797795be..08bf3b756 100644
--- a/source/game/GameData.cpp
+++ b/source/game/GameData.cpp
@@ -1174,6 +1174,8 @@ GameData::GameData(HWND hWnd, bool isGame):
 }
 GameData::~GameData()
 {
+	EndMap();
+
 	mem_release(g_pAsyncTaskRunner);
 	//mem_delete(g_pRagdoll);
 	mem_delete(g_pEditable);
diff --git a/source/terrax/terrax.cpp b/source/terrax/terrax.cpp
index 4f2fe39c9..26b466eb8 100644
--- a/source/terrax/terrax.cpp
+++ b/source/terrax/terrax.cpp
@@ -896,9 +896,9 @@ int main(int argc, char **argv)
 	mem_delete(pPipeline);
 	mem_release(g_pCameraConstantBuffer);
 	mem_delete(g_pGrid);
-	mem_delete(g_pUndoManager);
 	//SkyXEngine_Kill();
 	mem_release(pEngine);
+	mem_delete(g_pUndoManager);
 	return result;
 }
 
-- 
GitLab