[Uml-devel] kdesdk/umbrello/umbrello

[Oliver Kellogg]

CVS commit by okellogg: 

popupMenuSel(mt_Delete): UMLDoc::removeObject() may physically delete the
object, hence call UMLCanvasObject::removeAllAssociations() beforehand.


  M +1 -1      umllistview.cpp   1.152


--- kdesdk/umbrello/umbrello/umllistview.cpp  #1.151:1.152
@@ -373,5 +373,4 @@ void UMLListView::popupMenuSel(int sel) 
                                 }
                         }
-                        m_doc->removeUMLObject(object);
                         UMLCanvasObject *canvasObj = dynamic_cast<UMLCanvasObject*>(object);
                         if (canvasObj) {
@@ -386,4 +385,5 @@ void UMLListView::popupMenuSel(int sel) 
                                 canvasObj->removeAllAssociations();
                         }
+                        m_doc->removeUMLObject(object);
                 } else {
                         kdWarning() << "umllistview::listpopupmenu::mt_Delete called with unknown type"