Fixed searching of connector component.

OpenModelica · Nov 20, 2015 · b4d99f5 · b4d99f5
1 parent 9ec2016
commit b4d99f5
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.cpp b/OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.cpp
@@ -2657,18 +2657,27 @@ void ModelWidget::createModelWidgetComponents()
  */
 Component* ModelWidget::getConnectorComponent(Component *pConnectorComponent, QString connectorName)
 {
+  Component *pConnectorComponentFound = 0;
   foreach (Component *pComponent, pConnectorComponent->getComponentsList()) {
     if (pComponent->getName().compare(connectorName) == 0) {
-      return pComponent;
+      pConnectorComponentFound = pComponent;
+      return pConnectorComponentFound;
+    }
+    foreach (Component *pInheritedComponent, pComponent->getInheritedComponentsList()) {
+      pConnectorComponentFound = getConnectorComponent(pInheritedComponent, connectorName);
+      if (pConnectorComponentFound) {
+        return pConnectorComponentFound;
+      }
     }
   }
   /* if port is not found in components list then look into the inherited components list. */
   foreach (Component *pInheritedComponent, pConnectorComponent->getInheritedComponentsList()) {
-    if (pInheritedComponent->getName().compare(connectorName) == 0) {
-      return pInheritedComponent;
+    pConnectorComponentFound = getConnectorComponent(pInheritedComponent, connectorName);
+    if (pConnectorComponentFound) {
+      return pConnectorComponentFound;
     }
   }
-  return 0;
+  return pConnectorComponentFound;
 }
 
 void ModelWidget::refresh()