Fix crash if BaseView null on Section delete

FreeCAD · Feb 9, 2017 · 63d5749 · 63d5749
1 parent 69163cb
commit 63d5749
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/src/Mod/TechDraw/App/DrawViewSection.cpp b/src/Mod/TechDraw/App/DrawViewSection.cpp
@@ -552,15 +552,20 @@ std::vector<TopoDS_Wire> DrawViewSection::getWireForFace(int idx) const
 
 void DrawViewSection::unsetupObject()
 {
-    getBaseDVP()->touch();
+    TechDraw::DrawViewPart* base = getBaseDVP();
+    if (base != nullptr) {
+        base->touch();
+    }
 }
 
 TechDraw::DrawViewPart* DrawViewSection::getBaseDVP()
 {
     TechDraw::DrawViewPart* baseDVP = nullptr;
     App::DocumentObject* base = BaseView.getValue();
-    if (base->getTypeId().isDerivedFrom(TechDraw::DrawViewPart::getClassTypeId())) {
-        baseDVP = static_cast<TechDraw::DrawViewPart*>(base);
+    if (base != nullptr) {
+        if (base->getTypeId().isDerivedFrom(TechDraw::DrawViewPart::getClassTypeId())) {
+            baseDVP = static_cast<TechDraw::DrawViewPart*>(base);
+        }
     }
     return baseDVP;
 }
@@ -569,8 +574,10 @@ TechDraw::DrawProjGroupItem* DrawViewSection::getBaseDPGI()
 {
     TechDraw::DrawProjGroupItem* baseDPGI = nullptr;
     App::DocumentObject* base = BaseView.getValue();
-    if (base->getTypeId().isDerivedFrom(TechDraw::DrawProjGroupItem::getClassTypeId())) {
-        baseDPGI = static_cast<TechDraw::DrawProjGroupItem*>(base);
+    if (base != nullptr) {
+        if (base->getTypeId().isDerivedFrom(TechDraw::DrawProjGroupItem::getClassTypeId())) {
+            baseDPGI = static_cast<TechDraw::DrawProjGroupItem*>(base);
+        }
     }
     return baseDPGI;
 }