Merge branch 'clickcrash' into 'master'

Don't crash when clicking the logo video

See merge request OpenMW/openmw!3736
qt6_macos
Alexei Kotov 4 months ago
commit 961c53f1c4

@ -58,7 +58,7 @@ void WindowBase::setVisible(bool visible)
onClose();
}
bool WindowBase::isVisible()
bool WindowBase::isVisible() const
{
return mMainWidget->getVisible();
}

@ -37,7 +37,7 @@ namespace MWGui
/// Sets the visibility of the window
void setVisible(bool visible) override;
/// Returns the visibility state of the window
bool isVisible();
bool isVisible() const;
void center();

@ -158,8 +158,9 @@ namespace MWInput
// Don't trigger any mouse bindings while in settings menu, otherwise rebinding controls becomes impossible
// Also do not trigger bindings when input controls are disabled, e.g. during save loading
if (!MWBase::Environment::get().getWindowManager()->getSettingsWindow()->isVisible()
&& !input->controlsDisabled())
const MWGui::SettingsWindow* settingsWindow
= MWBase::Environment::get().getWindowManager()->getSettingsWindow();
if ((!settingsWindow || !settingsWindow->isVisible()) && !input->controlsDisabled())
mBindingsManager->mousePressed(arg, id);
}

Loading…
Cancel
Save