From 0422a389ad0289880dc5cead1c8d0788fa881e73 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com>
Date: Wed, 13 May 2026 23:29:23 +0300
Subject: #5810 Improve early exit's cleanup

---
 indra/newview/llappviewerwin32.cpp | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'indra/newview/llappviewerwin32.cpp')

diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp
index 3dc98b83c4..4e443ee189 100644
--- a/indra/newview/llappviewerwin32.cpp
+++ b/indra/newview/llappviewerwin32.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewerlgpl$
  * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
+ * Copyright (C) 2026, Linden Research, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -854,12 +854,7 @@ bool LLAppViewerWin32::cleanup()
     bool result = LLAppViewer::cleanup();
 
     gDXHardware.cleanup();
-
-    if (mIsConsoleAllocated)
-    {
-        FreeConsole();
-        mIsConsoleAllocated = false;
-    }
+    cleanupConsole();
 
     return result;
 }
@@ -943,6 +938,15 @@ void LLAppViewerWin32::initConsole()
     return LLAppViewer::initConsole();
 }
 
+void LLAppViewerWin32::cleanupConsole()
+{
+    if (mIsConsoleAllocated)
+    {
+        FreeConsole();
+        mIsConsoleAllocated = false;
+    }
+}
+
 void write_debug_dx(const char* str)
 {
     std::string value = gDebugInfo["DXInfo"].asString();
-- 
cgit v1.3