issue #0004258: FreeCAD crashes on "Edit datum" in PartDesign when datum in Part [skip-ci]

This commit is contained in:
wmayer
2020-01-30 16:07:17 +01:00
parent c1f19e0aba
commit 4cdf939025

View File

@@ -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);