From 8da891b06e971acfe8d60865b8121205bd21eb70 Mon Sep 17 00:00:00 2001
From: Adeel Asghar <adeel.asghar@liu.se>
Date: Wed, 25 Nov 2015 22:51:36 +0100
Subject: [PATCH] Correctly set the save contents type when opening a class.

---
 OMEdit/OMEditGUI/Modeling/LibraryTreeWidget.cpp | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/OMEdit/OMEditGUI/Modeling/LibraryTreeWidget.cpp b/OMEdit/OMEditGUI/Modeling/LibraryTreeWidget.cpp
index 65904039429..e3069ad8ead 100644
--- a/OMEdit/OMEditGUI/Modeling/LibraryTreeWidget.cpp
+++ b/OMEdit/OMEditGUI/Modeling/LibraryTreeWidget.cpp
@@ -341,11 +341,19 @@ LibraryTreeItem::LibraryTreeItem(LibraryType type, QString text, QString nameStr
   setIsDocumentationClass(false);
   if (isFilePathValid()) {
     QFileInfo fileInfo(getFileName());
-    // if item has file name as package.mo then its save folder structure
-    if (fileInfo.fileName().compare("package.mo") == 0) {
+    // if item has file name as package.mo and is top level then its save folder structure
+    if (isTopLevel() && (fileInfo.fileName().compare("package.mo") == 0)) {
       setSaveContentsType(LibraryTreeItem::SaveFolderStructure);
-    } else {
+    } else if (isTopLevel()) {
       setSaveContentsType(LibraryTreeItem::SaveInOneFile);
+    } else {
+      if (mpParentLibraryTreeItem->getFileName().compare(getFileName()) == 0) {
+        setSaveContentsType(LibraryTreeItem::SaveInOneFile);
+      } else if (fileInfo.fileName().compare("package.mo") == 0) {
+        setSaveContentsType(LibraryTreeItem::SaveFolderStructure);
+      } else {
+        setSaveContentsType(LibraryTreeItem::SaveInOneFile);
+      }
     }
   }
   setClassText("");