Merge branch 'master' of https://github.com/OpenModelica/OMEdit

Conflicts: OMEdit/OMEditGUI/Editors/MetaModelEditor.cpp
OpenModelica · Apr 7, 2016 · 0b9b099 · 0b9b099
2 parents fcbacb9 + 5e460b6
commit 0b9b099
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/OMEdit/OMEditGUI/Editors/MetaModelEditor.cpp b/OMEdit/OMEditGUI/Editors/MetaModelEditor.cpp
@@ -436,8 +436,10 @@ void MetaModelEditor::addInterfacesData(QDomElement interfaces)
     QDomElement subModel = subModelList.at(i).toElement();
     QDomElement interfaceDataElement = interfaces.firstChildElement();
     while (!interfaceDataElement.isNull()) {
+      subModel = subModelList.at(i).toElement();
       if (subModel.attribute("Name").compare(interfaceDataElement.attribute("model")) == 0) {
         QDomElement interfacePoint;
+        // update interface point
         if (existInterfaceData(subModel.attribute("Name"), interfaceDataElement)) {
           interfacePoint = getInterfacePoint(subModel.attribute("Name"), interfaceDataElement.attribute("Name"));
           interfacePoint.setAttribute("Name", interfaceDataElement.attribute("Name"));
@@ -454,7 +456,7 @@ void MetaModelEditor::addInterfacesData(QDomElement interfaces)
               alignInterfaces(pConnectionLineAnnotation->getStartComponentName(), pConnectionLineAnnotation->getEndComponentName(), false);
             }
           }
-        } else {
+        } else {  // insert interface point
           QDomElement interfacePoint = mXmlDocument.createElement("InterfacePoint");
           interfacePoint.setAttribute("Name", interfaceDataElement.attribute("Name"));
           interfacePoint.setAttribute("Position", interfaceDataElement.attribute("Position"));