Move call to Core._destroy() to appropriate place.

OpenXRay · Mar 8, 2018 · 5a5226b · 5a5226b
1 parent 0b190db
commit 5a5226b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/xrEngine/main.cpp b/src/xrEngine/main.cpp
@@ -281,7 +281,6 @@ ENGINE_API int RunApplication()
 
     Engine.External.Initialize();
     Startup();
-    Core._destroy();
     // check for need to execute something external
     if (/*xr_strlen(g_sLaunchOnExit_params) && */ xr_strlen(g_sLaunchOnExit_app))
     {

diff --git a/src/xr_3da/entry_point.cpp b/src/xr_3da/entry_point.cpp
@@ -35,7 +35,11 @@ int entry_point(pcstr commandLine)
     }
     Core.Initialize("OpenXRay", nullptr, true, *fsgame ? fsgame : nullptr);
 
-    return RunApplication();
+    auto result = RunApplication();
+
+    Core._destroy();
+
+    return result;
 }
 
 int StackoverflowFilter(const int exceptionCode)