Fix bad parent initialization bug

ComputationalBiomechanicsLab · Feb 14, 2025 · 9eaae85 · 9eaae85
1 parent 328c283
commit 9eaae85
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/libopensimcreator/UI/MeshWarper/MeshWarpingTab.cpp b/libopensimcreator/UI/MeshWarper/MeshWarpingTab.cpp
@@ -30,7 +30,7 @@ class osc::MeshWarpingTab::Impl final : public TabPrivate {
 
     explicit Impl(MeshWarpingTab& owner, Widget* parent_) :
         TabPrivate{owner, parent_, OSC_ICON_BEZIER_CURVE " Mesh Warping"},
-        m_Shared{std::make_shared<MeshWarpingTabSharedState>(id(), owner, App::singleton<SceneCache>(App::resource_loader()))}
+        m_Shared{std::make_shared<MeshWarpingTabSharedState>(id(), &owner, App::singleton<SceneCache>(App::resource_loader()))}
     {
         m_PanelManager->register_toggleable_panel(
             "Source Mesh",

diff --git a/libopensimcreator/UI/MeshWarper/MeshWarpingTabSharedState.h b/libopensimcreator/UI/MeshWarper/MeshWarpingTabSharedState.h
@@ -19,6 +19,7 @@
 #include <liboscar/Maths/PolarPerspectiveCamera.h>
 #include <liboscar/Maths/Vec2.h>
 #include <liboscar/Maths/Vec3.h>
+#include <liboscar/Platform/App.h>
 #include <liboscar/Platform/Widget.h>
 #include <liboscar/UI/Events/CloseTabEvent.h>
 #include <liboscar/UI/Popups/PopupManager.h>
@@ -37,13 +38,13 @@ namespace osc
     // top-level UI state that is shared by all UI panels
     class MeshWarpingTabSharedState final {
     public:
-        MeshWarpingTabSharedState(
+        explicit MeshWarpingTabSharedState(
             UID tabID_,
-            Widget& parent_,
+            Widget* parent_,
             std::shared_ptr<SceneCache> sceneCache_) :
 
             m_TabID{tabID_},
-            m_Parent{parent_.weak_ref()},
+            m_Parent{parent_},
             m_SceneCache{std::move(sceneCache_)}
         {
             OSC_ASSERT(m_SceneCache != nullptr);
@@ -183,8 +184,9 @@ namespace osc
 
         void closeTab()
         {
-            CloseTabEvent e{m_TabID};
-            m_Parent->on_event(e);
+            if (m_Parent) {
+                App::post_event(*m_Parent, std::make_unique<CloseTabEvent>(m_TabID));
+            }
         }
 
         bool canUndo() const
@@ -260,7 +262,7 @@ namespace osc
         UID m_TabID;
 
         // handle to the screen that owns the TPS3D tab
-        LifetimedPtr<Widget> m_Parent;
+        Widget* m_Parent;
 
         // cached TPS3D algorithm result (to prevent recomputing it over and over)
         TPSResultCache m_WarpingCache;