mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-16 16:29:55 +00:00
Code Issues Releases Wiki Activity

Merge branch 'fix_ui_crashes' into 'master'

Browse source 
Another day, another UI crash fix

See merge request OpenMW/openmw!3949
This commit is contained in:
psi29a 2024-03-15 11:03:21 +00:00
commit 5d669f0470
2 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
components/lua_ui/element.cpp
View file

@ -99,15 +99,6 @@ namespace LuaUi
element->create(depth + 1);
WidgetExtension* root = element->mRoot;
assert(root);
WidgetExtension* parent = root->getParent();
if (parent)
{
auto children = parent->children();
std::erase(children, root);
parent->setChildren(children);
root->widget()->detachFromWidget();
}
root->updateCoord();
return root;
}
@ -313,9 +304,8 @@ namespace LuaUi
{
if (mState != Destroyed)
{
if (mState != New)
if (mRoot != nullptr)
{
assert(mRoot);
destroyRoot(mRoot);
mRoot = nullptr;
}

8
components/lua_ui/widget.cpp
View file

@ -100,6 +100,8 @@ namespace LuaUi
void WidgetExtension::attach(WidgetExtension* ext)
{
if (ext->mParent != this)
ext->detachFromParent();
ext->mParent = this;
ext->mTemplateChild = false;
ext->widget()->attachToWidget(mSlot->widget());
@ -114,7 +116,13 @@ namespace LuaUi
void WidgetExtension::detachFromParent()
{
if (mParent)
{
auto children = mParent->children();
std::erase(children, this);
mParent->setChildren(children);
mParent = nullptr;
}
widget()->detachFromWidget();
}