teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Fix crash due to not calling WindowModal::onClose()

Browse source
This commit is contained in:
scrawl 2017-09-24 13:57:09 +02:00
parent ca3b08b852
commit 94b538ac82
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwgui/race.cpp
View file

@ -187,6 +187,8 @@ namespace MWGui
void RaceDialog::onClose() void RaceDialog::onClose()
{ {
WindowModal::onClose();
mPreviewImage->setRenderItemTexture(NULL); mPreviewImage->setRenderItemTexture(NULL);
mPreviewTexture.reset(NULL); mPreviewTexture.reset(NULL);

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

@ -1738,9 +1738,12 @@ namespace MWGui
// Only remove the top if it matches the current pointer. A lot of things hide their visibility before showing it, // Only remove the top if it matches the current pointer. A lot of things hide their visibility before showing it,
//so just popping the top would cause massive issues. //so just popping the top would cause massive issues.
if(!mCurrentModals.empty()) if(!mCurrentModals.empty())
{
if(input == mCurrentModals.top()) if(input == mCurrentModals.top())
mCurrentModals.pop(); mCurrentModals.pop();
else
std::cout << " warning: modal widget " << input << " " << typeid(input).name() << " not found " << std::endl;
}
if (mCurrentModals.empty()) if (mCurrentModals.empty())
mKeyboardNavigation->restoreFocus(getMode()); mKeyboardNavigation->restoreFocus(getMode());
} }