AnarchistGamers/openmw
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-09-19 09:27:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'settingscrash' into 'master'

Browse Source 
Fix some dangling window pointer use on exit

See merge request OpenMW/openmw!4846
This commit is contained in:
Alexei Kotov 2025-08-14 13:52:56 +03:00
commit 32e463945e
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/openmw/mwgui/windowmanagerimp.cpp
View File

@ -891,6 +891,9 @@ namespace MWGui
if (!mCurrentModals.empty()) if (!mCurrentModals.empty())
return mCurrentModals.back(); return mCurrentModals.back();
if (mWindows.empty())
return nullptr;
if (isSettingsWindowVisible()) if (isSettingsWindowVisible())
return mSettingsWindow; return mSettingsWindow;
@ -2650,6 +2653,9 @@ namespace MWGui
if (!Settings::gui().mControllerMenus || !mControllerButtonsOverlay) if (!Settings::gui().mControllerMenus || !mControllerButtonsOverlay)
return; return;
if (mWindows.empty())
return;
WindowBase* topWin = getActiveControllerWindow(); WindowBase* topWin = getActiveControllerWindow();
if (!topWin || !topWin->isVisible()) if (!topWin || !topWin->isVisible())
{ {