From 41b1fdcb8476d79558a640e9ed83c74f0698cf1b Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Fri, 14 Jun 2024 14:02:57 +0200
Subject: [PATCH] PD: Fixes issue #14598: FreeCAD crashes on Undo

---
 src/Mod/PartDesign/Gui/ViewProviderBody.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Mod/PartDesign/Gui/ViewProviderBody.cpp b/src/Mod/PartDesign/Gui/ViewProviderBody.cpp
index 8722e0a024..3e3a3b6f39 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderBody.cpp
+++ b/src/Mod/PartDesign/Gui/ViewProviderBody.cpp
@@ -452,8 +452,10 @@ void ViewProviderBody::unifyVisualProperty(const App::Property* prop) {
         }
 
         //copy over the properties data
-        auto fprop = gdoc->getViewProvider(feature)->getPropertyByName(prop->getName());
-        fprop->Paste(*prop);
+        if (Gui::ViewProvider* vp = gdoc->getViewProvider(feature)) {
+            auto fprop = vp->getPropertyByName(prop->getName());
+            fprop->Paste(*prop);
+        }
     }
 }