Merge branch 'fix_element_destroy' into 'master'

Fix bug in LuaUi::Element::destroy() that sometimes leads to an infinite loop on UI cleanup

See merge request OpenMW/openmw!3033

(cherry picked from commit 364bc91f5b)

c6eed2a6 Fix bug in LuaUi::Element::destroy() that sometimes leads to an infinite loop on UI cleanup
backport_gl_clamp_removal openmw-48-rc10
psi29a 1 year ago
parent 0e141dc06e
commit 4f919d9239

@ -217,12 +217,12 @@ namespace LuaUi
void Element::destroy()
{
sAllElements.erase(this);
if (!mRoot)
return;
destroyWidget(mRoot);
mRoot = nullptr;
mLayout = sol::make_object(mLayout.lua_state(), sol::nil);
sAllElements.erase(this);
}
void Element::attachToWidget(WidgetExtension* w)

Loading…
Cancel
Save