issue #4258: FreeCAD crashes on "Edit datum" in PartDesign when datum…

… in Part [skip-ci]
FreeCAD · Jan 30, 2020 · f70a267 · f70a267
1 parent cc5e5f9
commit f70a267
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/Mod/PartDesign/Gui/TaskDatumParameters.cpp b/src/Mod/PartDesign/Gui/TaskDatumParameters.cpp
@@ -138,7 +138,7 @@ bool TaskDlgDatumParameters::accept() {
     //the user has to decide which option we should take if external references are used
     bool extReference = false;
     for (App::DocumentObject* obj : pcDatum->Support.getValues()) {
-        if (!pcActiveBody->hasObject(obj) && !pcActiveBody->getOrigin()->hasObject(obj))
+        if (pcActiveBody && !pcActiveBody->hasObject(obj) && !pcActiveBody->getOrigin()->hasObject(obj))
             extReference = true;
     }
 
@@ -157,7 +157,7 @@ bool TaskDlgDatumParameters::accept() {
             std::vector<std::string> subs = pcDatum->Support.getSubValues();
             int index = 0;
             for (App::DocumentObject* obj : pcDatum->Support.getValues()) {
-                if (!pcActiveBody->hasObject(obj) && !pcActiveBody->getOrigin()->hasObject(obj)) {
+                if (pcActiveBody && !pcActiveBody->hasObject(obj) && !pcActiveBody->getOrigin()->hasObject(obj)) {
                     auto* copy = PartDesignGui::TaskFeaturePick::makeCopy(obj, subs[index], dlg.radioIndependent->isChecked());
                     if (copy) {
                         copyObjects.push_back(copy);