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()) {