diff options
| author | psi29a <psi29a@gmail.com> | 2023-05-21 17:33:56 +0000 |
|---|---|---|
| committer | psi29a <psi29a@gmail.com> | 2023-05-21 17:34:13 +0000 |
| commit | 4f919d9239c871e40c79dd04be5342eec8120128 (patch) | |
| tree | f6ba8d1b85be79145c013867e29695c037a51b6d | |
| parent | 0e141dc06e7b8cb5c84519ede4f5fd3a309d3fd8 (diff) | |
Merge branch 'fix_element_destroy' into 'master'openmw-48-rc10
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 364bc91f5b2ef6d79f21545f43d131d1d71b342c)
c6eed2a6 Fix bug in LuaUi::Element::destroy() that sometimes leads to an infinite loop on UI cleanup
| -rw-r--r-- | components/lua_ui/element.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components/lua_ui/element.cpp b/components/lua_ui/element.cpp index ccf54ddec4..273730c962 100644 --- a/components/lua_ui/element.cpp +++ b/components/lua_ui/element.cpp @@ -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) |