From 94caf98ece4178c933e549c13c60eb1da5bda365 Mon Sep 17 00:00:00 2001
From: Andy Lanzone <andy@enoznal.com>
Date: Wed, 26 Nov 2025 05:41:45 -0800
Subject: [PATCH] Fix 'Show Controller Tooltips By Default' option being
 ignored

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

diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 15b5b20258..8352a5e026 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -1498,7 +1498,11 @@ namespace MWGui
         if (Settings::gui().mControllerMenus)
         {
             if (mGuiModes.empty())
+            {
                 setControllerTooltipVisible(false);
+                // When all windows are hidden, reset tooltip visibility to user's preference.
+                mControllerTooltipEnabled = Settings::gui().mControllerTooltips;
+            }
             else
                 reapplyActiveControllerWindow();
         }