[Uml-devel] kdesdk/umbrello/umbrello

[Oliver Kellogg]

CVS commit by okellogg: 

mergeUMLRepresentationIntoAssociationData(): Ruggedization by Pekka (pjaaskel_AT_cs.tut.fi)


  M +4 -0      associationwidget.cpp   1.119


--- kdesdk/umbrello/umbrello/associationwidget.cpp  #1.118:1.119
@@ -1110,4 +1110,8 @@ void AssociationWidget::mergeUMLRepresen
         UMLAssociation *uml = getAssociation();
 
+        if (uml == NULL) {
+                kdDebug() << "The UMLAssociation* uml is null -- returning from the function to avoid crashing."  << endl;
+                return;
+        }
         // block signals until finished
         uml->blockSignals(true);