Gui: [skip ci] fix crash in DocumentObjectData::updateChildren() when…

… canceling a pending task
FreeCAD · Sep 16, 2020 · ff0f8b0 · ff0f8b0
1 parent 7a93bcb
commit ff0f8b0
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/src/Gui/Tree.cpp b/src/Gui/Tree.cpp
@@ -322,11 +322,17 @@ class Gui::DocumentObjectData {
             if (newSet.find(child) == newSet.end()) {
                 // this means old child removed
                 updated = true;
-                docItem->_ParentMap[child].erase(obj);
+                auto mapIt = docItem->_ParentMap.find(child);
 
-                auto childVp = docItem->getViewProvider(child);
-                if (childVp && child->getDocument() == obj->getDocument())
-                    childVp->setShowable(docItem->isObjectShowable(child));
+                // If 'child' is not part of the map then it has already been deleted
+                // in _slotDeleteObject.
+                if (mapIt != docItem->_ParentMap.end()) {
+                    docItem->_ParentMap[child].erase(obj);
+
+                    auto childVp = docItem->getViewProvider(child);
+                    if (childVp && child->getDocument() == obj->getDocument())
+                        childVp->setShowable(docItem->isObjectShowable(child));
+                }
             }
         }
         // We still need to check the order of the children