mirror of
https://github.com/OpenMW/openmw.git
synced 2025-11-30 20:04:33 +00:00
Merge branch 'master' into 'master'
Fix 'Show Controller Tooltips By Default' option being ignored Closes #8799 See merge request OpenMW/openmw!5003
This commit is contained in:
commit
a00ede3595
1 changed files with 4 additions and 0 deletions
|
|
@ -1498,7 +1498,11 @@ namespace MWGui
|
||||||
if (Settings::gui().mControllerMenus)
|
if (Settings::gui().mControllerMenus)
|
||||||
{
|
{
|
||||||
if (mGuiModes.empty())
|
if (mGuiModes.empty())
|
||||||
|
{
|
||||||
setControllerTooltipVisible(false);
|
setControllerTooltipVisible(false);
|
||||||
|
// When all windows are hidden, reset tooltip visibility to user's preference.
|
||||||
|
mControllerTooltipEnabled = Settings::gui().mControllerTooltips;
|
||||||
|
}
|
||||||
else
|
else
|
||||||
reapplyActiveControllerWindow();
|
reapplyActiveControllerWindow();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue