fix crash when trying to drag and drop origin object in body object

2017-04-06 19:16:27 +02:00
parent 10ad6c6d02
commit 692dda9082
1 changed files with 6 additions and 3 deletions
--- a/src/Mod/PartDesign/App/Body.cpp
+++ b/src/Mod/PartDesign/App/Body.cpp
@@ -146,7 +146,8 @@ App::DocumentObject* Body::getPrevSolidFeature(App::DocumentObject *start)
        return nullptr;
    }

-    assert ( hasObject ( start ) );
+    if (!hasObject(start))
+        return nullptr;

    const std::vector<App::DocumentObject*> & features = Group.getValues();

@@ -372,8 +373,10 @@ void Body::removeObject(App::DocumentObject* feature)
    }

    // Erase feature from Group
-    model.erase(it);
-    Group.setValues(model);
+    if (it != model.end()) {
+        model.erase(it);
+        Group.setValues(model);
+    }
 }