Fixed error messages link for files.

OpenModelica · Nov 11, 2015 · e904fa3 · e904fa3
1 parent a3c21e7
commit e904fa3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/OMEdit/OMEditGUI/Modeling/LibraryTreeWidget.cpp b/OMEdit/OMEditGUI/Modeling/LibraryTreeWidget.cpp
@@ -1827,14 +1827,18 @@ QModelIndex LibraryTreeModel::libraryTreeItemIndexHelper(const LibraryTreeItem *
  */
 LibraryTreeItem* LibraryTreeModel::getLibraryTreeItemFromFileHelper(LibraryTreeItem *pLibraryTreeItem, QString fileName, int lineNumber)
 {
+  LibraryTreeItem *pFoundLibraryTreeItem = 0;
   for (int i = 0; i < pLibraryTreeItem->getChildren().size(); i++) {
     LibraryTreeItem *pChildLibraryTreeItem = pLibraryTreeItem->child(i);
     if ((pChildLibraryTreeItem->getFileName().compare(fileName) == 0) && pLibraryTreeItem->inRange(lineNumber)) {
       return pChildLibraryTreeItem;
     }
   }
   for (int i = 0; i < pLibraryTreeItem->getChildren().size(); i++) {
-    return getLibraryTreeItemFromFileHelper(pLibraryTreeItem->child(i), fileName, lineNumber);
+    pFoundLibraryTreeItem = getLibraryTreeItemFromFileHelper(pLibraryTreeItem->child(i), fileName, lineNumber);
+    if (pFoundLibraryTreeItem) {
+      return pFoundLibraryTreeItem;
+    }
   }
   return 0;
 }

diff --git a/OMEdit/OMEditGUI/Modeling/MessagesWidget.cpp b/OMEdit/OMEditGUI/Modeling/MessagesWidget.cpp
@@ -199,7 +199,8 @@ void MessagesWidget::addGUIMessage(MessageItem messageItem)
   }
   if (messageItem.getFileName().isEmpty()) { // if custom error message
     errorMessage = message;
-  } else if (messageItem.getMessageItemType()== MessageItem::TLM || mpMainWindow->getOMCProxy()->existClass(messageItem.getFileName())) {
+  } else if (messageItem.getMessageItemType()== MessageItem::TLM ||
+             mpMainWindow->getLibraryWidget()->getLibraryTreeModel()->findLibraryTreeItem(messageItem.getFileName())) {
     // If the class is only loaded in AST via loadString then create link for the error message.
     errorMessage = linkFormat.arg(messageItem.getFileName())
         .arg(messageItem.getLocation())