From 2bb1c4810dea9e00075d3f8882d382d5b81f65a8 Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Mon, 11 Aug 2025 13:38:22 +0300
Subject: [PATCH] Fix some dangling window pointer use on exit

---
 apps/openmw/mwgui/windowmanagerimp.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 261a5e6e16..8d02dabff0 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -891,6 +891,9 @@ namespace MWGui
         if (!mCurrentModals.empty())
             return mCurrentModals.back();
 
+        if (mWindows.empty())
+            return nullptr;
+
         if (isSettingsWindowVisible())
             return mSettingsWindow;
 
@@ -2650,6 +2653,9 @@ namespace MWGui
         if (!Settings::gui().mControllerMenus || !mControllerButtonsOverlay)
             return;
 
+        if (mWindows.empty())
+            return;
+
         WindowBase* topWin = getActiveControllerWindow();
         if (!topWin || !topWin->isVisible())
         {