From b7dbd41e05eae80b58d21038ff383082c2f740e7 Mon Sep 17 00:00:00 2001
From: Robert Haschke <rhaschke@techfak.uni-bielefeld.de>
Date: Sat, 18 May 2024 17:21:32 +0200
Subject: [PATCH] Fix #1825/#1830: segfault when hiding deleted properties

---
 src/rviz/properties/property.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/rviz/properties/property.cpp b/src/rviz/properties/property.cpp
index df0fb7433..b86df0410 100644
--- a/src/rviz/properties/property.cpp
+++ b/src/rviz/properties/property.cpp
@@ -397,10 +397,7 @@ void Property::setModel(PropertyTreeModel* model)
   if (model_ && hidden_)
   {
     // process propertyHiddenChanged after insertion into model has finished
-    QTimer::singleShot(0, model_, [this]() {
-      if (model_)
-        model_->emitPropertyHiddenChanged(this);
-    });
+    QTimer::singleShot(0, this, [this]() { model_->emitPropertyHiddenChanged(this); });
   }
   int num_children = numChildren();
   for (int i = 0; i < num_children; i++)