Don't free ui element's shared_ptr right before destroying it

1 year ago · e1cbeb0d3b
parent 11ae1a1fcb
commit e1cbeb0d3b
1 changed files with 6 additions and 5 deletions
--- a/components/lua_ui/element.cpp
+++ b/components/lua_ui/element.cpp
@ -216,12 +216,13 @@ namespace LuaUi

    void Element::destroy()
    {
+        if (mRoot)
+        {
+            destroyWidget(mRoot);
+            mRoot = nullptr;
+            mLayout = sol::make_object(mLayout.lua_state(), sol::nil);
+        }
        sAllElements.erase(this);
-        if (!mRoot)
-            return;
-        destroyWidget(mRoot);
-        mRoot = nullptr;
-        mLayout = sol::make_object(mLayout.lua_state(), sol::nil);
    }

    void Element::attachToWidget(WidgetExtension* w)