[Uml-devel] KDE/kdesdk/umbrello

[Oliver Kellogg]

SVN commit 627600 by okellogg:

sync with branches/KDE/3.5 (r627468)

 M  +5 -0      ChangeLog  
 M  +1 -1      VERSION  
 M  +4 -0      umbrello/toolbarstateassociation.cpp  


--- trunk/KDE/kdesdk/umbrello/ChangeLog #627599:627600
@@ -1,3 +1,8 @@
+Version 1.5.61
+
+* Fixed crash on anchoring note to diagram object
+  http://sourceforge.net/mailarchive/forum.php?thread_id=31539549&forum_id=460
+
 Version 1.5.6
 
 * Fixed save/reload of association widgets for collaboration diagrams
--- trunk/KDE/kdesdk/umbrello/VERSION #627599:627600
@@ -1 +1 @@
-1.5.6
+1.5.61
--- trunk/KDE/kdesdk/umbrello/umbrello/toolbarstateassociation.cpp #627599:627600
@@ -208,6 +208,10 @@
     if (m_pUMLView->addAssociation(a, false)) {
         // if view went ok, then append in document
         UMLAssociation *umla = a->getAssociation();
+        if (umla == NULL) {
+            // association without model representation in UMLDoc
+            return;
+        }
         Uml::Model_Type m = Model_Utils::convert_DT_MT(m_pUMLView->getType());
         UMLDoc *umldoc = UMLApp::app()->getDocument();
         umla->setUMLPackage(umldoc->getRootFolder(m));