Addendum to 1281716 - Makes "Quit" close the game instantly without last frame-hang, and avoids risk of ungraceful exit code

Author: Dutchman101

Client/cefweb/CWebCore.cpp

@@ -17,6 +17,8 @@
 #include <cef3/cef/include/cef_parser.h>
 #include "WebBrowserHelpers.h"
 #include "CWebApp.h"
+#include <algorithm>
+#include <ranges>
 
 // #define CEF_ENABLE_SANDBOX
 #ifdef CEF_ENABLE_SANDBOX
@@ -39,12 +41,15 @@ CWebCore::CWebCore()
 
 CWebCore::~CWebCore()
 {
-    // Unregister schema factories
+    std::ranges::for_each(m_WebViews, [](const auto& pWebView) {
+        if (pWebView) [[likely]]
+            pWebView->CloseBrowser();
+    });
+    m_WebViews.clear();
     CefClearSchemeHandlerFactories();
 
-    // Shutdown CEF
-    CefShutdown();
-
+    // Don't call CefShutdown() here to avoid freeze.
+    // TerminateProcess (during quit) is called before CCore destruction anyways.
     delete m_pRequestsGUI;
     delete m_pXmlConfig;
 }

Client/core/CCore.cpp

@@ -121,7 +121,6 @@ CCore::CCore()
 
     m_bIsOfflineMod = false;
     m_bQuitOnPulse = false;
-    m_bIsQuitting = false;
     m_bDestroyMessageBox = false;
     m_bCursorToggleControls = false;
     m_bLastFocused = true;
@@ -1166,12 +1165,7 @@ CWebCoreInterface* CCore::GetWebCore()
 void CCore::DestroyWeb()
 {
     WriteDebugEvent("CCore::DestroyWeb");
-    // Skip CEF cleanup during quit sequence - TerminateProcess will handle it
-    // Doing CefShutdown() here will cause a freeze, and cleanup is unnecessary when terminating
-    if (!m_bIsQuitting)
-    {
-        SAFE_DELETE(m_pWebCore);
-    }
+    SAFE_DELETE(m_pWebCore);
     m_WebCoreModule.UnloadModule();
 }
 
@@ -1464,7 +1458,6 @@ void CCore::Quit(bool bInstantly)
 {
     if (bInstantly)
     {
-        m_bIsQuitting = true;            // Skip CEF cleanup to prevent CefShutdown freeze
         AddReportLog(7101, "Core - Quit");
         // Show that we are quiting (for the crash dump filename)
         SetApplicationSettingInt("last-server-ip", 1);
@@ -1478,13 +1471,13 @@ void CCore::Quit(bool bInstantly)
         // Destroy the client
         CModManager::GetSingleton().Unload();
 
-        // Destroy ourself
+        // Use TerminateProcess before destroying CCore to ensure clean exit code
+        TerminateProcess(GetCurrentProcess(), 0);
+
+        // Destroy ourself (unreachable but kept for completeness)
         delete CCore::GetSingletonPtr();
 
         WatchDogCompletedSection("Q0");
-
-        // Use TerminateProcess for now as exiting the normal way crashes
-        TerminateProcess(GetCurrentProcess(), 0);
     }
     else
     {

Client/core/CCore.h

@@ -367,7 +367,6 @@ class CCore : public CCoreInterface, public CSingleton<CCore>
     SString m_strModInstallRoot;
 
     bool m_bQuitOnPulse;
-    bool m_bIsQuitting;
     bool m_bDestroyMessageBox;
 
     bool                 m_bDoneFrameRateLimit;