From d93f094cf5d8a9de95817622fec535bc1396818d Mon Sep 17 00:00:00 2001 From: marauder2k7 Date: Mon, 5 May 2025 20:14:03 +0100 Subject: [PATCH] Update console.cpp move shutdown function to after PathExpandos is defined and clear it to remove it from memlog --- Engine/source/console/console.cpp | 32 ++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/Engine/source/console/console.cpp b/Engine/source/console/console.cpp index f56051e7e..760142b2c 100644 --- a/Engine/source/console/console.cpp +++ b/Engine/source/console/console.cpp @@ -427,21 +427,6 @@ void init() smConsoleInput.notify(postConsoleInput); } -//-------------------------------------- - -void shutdown() -{ - AssertFatal(active == true, "Con::shutdown should only be called once."); - active = false; - - smConsoleInput.remove(postConsoleInput); - - consoleLogFile.close(); - Namespace::shutdown(); - AbstractClassRep::shutdown(); - Compiler::freeConsoleParserList(); - gGlobalVars.reset(); -} bool isActive() { @@ -2111,6 +2096,23 @@ void ensureTrailingSlash(char* pDstPath, const char* pSrcPath, S32 dstSize) pDstPath[trailIndex] = 0; } +//-------------------------------------- + +void shutdown() +{ + AssertFatal(active == true, "Con::shutdown should only be called once."); + active = false; + + smConsoleInput.remove(postConsoleInput); + + consoleLogFile.close(); + Namespace::shutdown(); + AbstractClassRep::shutdown(); + Compiler::freeConsoleParserList(); + gGlobalVars.reset(); + PathExpandos.clear(); +} + //----------------------------------------------------------------------------- StringTableEntry getDSOPath(const char *scriptPath)