mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-06-26 21:21:34 +00:00
Code Issues Releases Wiki Activity

Merge branch 'mygui_crashes_on_exit' into 'master'

Browse source 
Resolve crashes on exit with visible MyGUI widgets

Closes #5899

See merge request OpenMW/openmw!654
This commit is contained in:
psi29a 2021-03-14 01:54:33 +00:00
commit dfae954eb2
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -108,6 +108,7 @@
Bug #5869: Guards can initiate arrest dialogue behind locked doors Bug #5869: Guards can initiate arrest dialogue behind locked doors
Bug #5871: The console appears if you type the Russian letter "Ё" in the name of the enchantment Bug #5871: The console appears if you type the Russian letter "Ё" in the name of the enchantment
Bug #5877: Effects appearing with empty icon Bug #5877: Effects appearing with empty icon
Bug #5899: Visible modal windows and dropdowns crashing game on exit
Feature #390: 3rd person look "over the shoulder" Feature #390: 3rd person look "over the shoulder"
Feature #832: OpenMW-CS: Handle deleted references Feature #832: OpenMW-CS: Handle deleted references
Feature #1536: Show more information about level on menu Feature #1536: Show more information about level on menu

1
apps/openmw/mwgui/layout.cpp
View file

@ -35,6 +35,7 @@ namespace MWGui
void Layout::shutdown() void Layout::shutdown()
{ {
setVisible(false);
MyGUI::Gui::getInstance().destroyWidget(mMainWidget); MyGUI::Gui::getInstance().destroyWidget(mMainWidget);
mListWindowRoot.clear(); mListWindowRoot.clear();
} }

4
apps/openmw/mwgui/windowmanagerimp.cpp
View file

@ -503,8 +503,6 @@ namespace MWGui
{ {
mStatsWatcher.reset(); mStatsWatcher.reset();
mKeyboardNavigation.reset();
MyGUI::LanguageManager::getInstance().eventRequestTag.clear(); MyGUI::LanguageManager::getInstance().eventRequestTag.clear();
MyGUI::PointerManager::getInstance().eventChangeMousePointer.clear(); MyGUI::PointerManager::getInstance().eventChangeMousePointer.clear();
MyGUI::InputManager::getInstance().eventChangeKeyFocus.clear(); MyGUI::InputManager::getInstance().eventChangeKeyFocus.clear();
@ -523,6 +521,8 @@ namespace MWGui
delete mCursorManager; delete mCursorManager;
delete mToolTips; delete mToolTips;
mKeyboardNavigation.reset();
cleanupGarbage(); cleanupGarbage();
mFontLoader.reset(); mFontLoader.reset();