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

[Ralf Habacker]

SVN commit 1267646 by habacker:

fixed "Bug 168752 - Crash on new synchronous message in sequence diagram"

backported from trunk r1267643

 M  +5 -3      classifier.cpp  


--- branches/KDE/4.7/kdesdk/umbrello/umbrello/classifier.cpp #1267645:1267646
@@ -187,12 +187,14 @@
         int i = 0;
         for (; i < pCount; ++i) {
             Model_Utils::NameAndType_ListIt nt(params.begin() + i);
-            UMLClassifier *c = dynamic_cast<UMLClassifier*>((*nt).m_type);
+            UMLClassifier *type = dynamic_cast<UMLClassifier*>((*nt).m_type);
             UMLClassifier *testType = testParams.at(i)->getType();
-            if (c == NULL) {  //template parameter
+            if (type == NULL && testType == NULL) { //no parameter type
+                continue;
+            } else if (type == NULL) {  //template parameter
                 if (testType->name() != "class")
                     break;
-            } else if (c != testType)
+            } else if (type != testType)
                 break;
         }
         if (i == pCount)