2
0
Эх сурвалжийг харах

Fixed project serialization with ignored files

Brian Fiete 4 жил өмнө
parent
commit
5fd037bc58
1 өөрчлөгдсөн 7 нэмэгдсэн , 2 устгасан
  1. 7 2
      IDE/src/Project.bf

+ 7 - 2
IDE/src/Project.bf

@@ -587,7 +587,7 @@ namespace IDE
 
 			if (mParentFolder != null)
 			{
-				data.Add("Type", (mIncludeKind == .Ignore) ? "IgnoreFolder" : "Folder");
+				data.Add("Type", (mIncludeKind == .Ignore) ? "IgnoreFolder" : (mIncludeKind == .Auto) ? "AutoFolder" : "Folder");
 	            base.Serialize(data);
 				if (mAutoInclude != (mIncludeKind == .Auto))
 					data.ConditionalAdd("AutoInclude", mAutoInclude, mIncludeKind == .Auto);
@@ -672,6 +672,11 @@ namespace IDE
                         projectItem = new ProjectFolder();
 						projectItem.mIncludeKind = .Manual;
 					}
+					else if (type == "AutoFolder")
+					{
+					    projectItem = new ProjectFolder();
+						projectItem.mIncludeKind = .Auto;
+					}
 					else if (type == "IgnoreFolder")
 					{
 						projectItem = new ProjectFolder();
@@ -727,7 +732,7 @@ namespace IDE
 				String fileName = scope String();
 				fileEntry.GetFileName(fileName);
 
-				if (!gApp.IsFilteredOut(fileName))
+				if ((!gApp.IsFilteredOut(fileName)) && (!mChildMap.ContainsKey(fileName)))
 				{
 					let projectItem = new ProjectSource();
 					projectItem.mProject = mProject;