[Uml-devel] branches/KDE/3.5/kdesdk/umbrello

[Oliver Kellogg]

SVN commit 632977 by okellogg:

removeAssocInViewAndDoc(): UMLListView::moveObject() will delete the containment
 AssociationWidget via UMLView::updateContainment().
BUG:141602


 M  +1 -0      ChangeLog  
 M  +4 -2      umbrello/umlview.cpp  


--- branches/KDE/3.5/kdesdk/umbrello/ChangeLog #632976:632977
@@ -1,6 +1,7 @@
 Version 1.5.7
 * Bugs fixed from http://bugs.kde.org:
 * Javascript Code Generation creates bad format methods (135540)
+* Crash when deleting the link between a package and a class (141602)
 
 Version 1.5.61
 
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/umlview.cpp #632976:632977
@@ -1767,6 +1767,8 @@
             lv->moveObject( objToBeMoved->getID(),
                             Model_Utils::convert_OT_LVT(objToBeMoved),
                             lv->theLogicalView() );
+            // UMLListView::moveObject() will delete the containment
+            // AssociationWidget via UMLView::updateContainment().
         } else {
             kDebug() << "removeAssocInViewAndDoc(containment): "
                       << "objB is NULL" << endl;
@@ -1774,9 +1776,9 @@
     } else {
         // Remove assoc in doc.
         m_pDoc->removeAssociation(a->getAssociation());
+        // Remove assoc in view.
+        removeAssoc(a);
     }
-    // Remove assoc in view.
-    removeAssoc(a);
 }
 
 /** Removes all the associations related to Widget */