[Uml-devel] KDE/kdesdk/umbrello

[Oliver Kellogg]

SVN commit 1284662 by okellogg:

AssocRules::allowAssociation(AssociationType, UMLWidget*, UMLWidget*) :

Exclude NULL when comparing widgetA->umlObject() and widgetB->umlObject()

BUG: 270597


 M  +2 -0      ChangeLog  
 M  +1 -1      umbrello/assocrules.cpp  


--- trunk/KDE/kdesdk/umbrello/ChangeLog #1284661:1284662
@@ -1,7 +1,9 @@
 Version 2.9.0 (unreleased)
 
 * New feature: Drawing of state diagrams with more pseudostates possible.
+* Cannot anchor note in state diagram (270597)
 * Color of role text on diagram (e.g. Role B) nearly invisible (291401)
+* Junk residual UMLAssociations saved to XMI (293042)
 
 Version 2.8.1
 
--- trunk/KDE/kdesdk/umbrello/umbrello/assocrules.cpp #1284661:1284662
@@ -147,7 +147,7 @@
     WidgetBase::WidgetType widgetTypeB = widgetB->baseType();
     bool bValid = false;
 
-    if ( widgetA->umlObject() == widgetB->umlObject() ) {
+    if (widgetA->umlObject() && widgetA->umlObject() == widgetB->umlObject()) {
         return allowSelf( assocType, widgetTypeA );
     }