Skip to content

Commit a00ede3

Browse files
committed
Merge branch 'master' into 'master'
Fix 'Show Controller Tooltips By Default' option being ignored Closes #8799 See merge request OpenMW/openmw!5003
2 parents 4722405 + 94caf98 commit a00ede3

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

apps/openmw/mwgui/windowmanagerimp.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1498,7 +1498,11 @@ namespace MWGui
14981498
if (Settings::gui().mControllerMenus)
14991499
{
15001500
if (mGuiModes.empty())
1501+
{
15011502
setControllerTooltipVisible(false);
1503+
// When all windows are hidden, reset tooltip visibility to user's preference.
1504+
mControllerTooltipEnabled = Settings::gui().mControllerTooltips;
1505+
}
15021506
else
15031507
reapplyActiveControllerWindow();
15041508
}

0 commit comments

Comments
 (0)