diff options
author | Lluis Sanchez <lluis@xamarin.com> | 2014-04-25 19:48:27 +0400 |
---|---|---|
committer | Lluis Sanchez <lluis@xamarin.com> | 2014-04-25 19:48:49 +0400 |
commit | 8c04bfe284be26658372923ef56a74e01568bf00 (patch) | |
tree | babe99caf43ee53422c05b4ac6b75f7d1e49b2be /main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad | |
parent | 4a7ab5aa618b73c87199e4ef35684eee5ef699d5 (diff) |
[Ide] Fix repeating folder name issue
When the last file of a folder is removed, MD adds an empty folder object
to the project file list, so that the folder is shown in the solution pad.
However, that code was not checking if the folder did exist. It does it now.
This fixes bug #19285 - Shared Asset projects are repeating folders.
Diffstat (limited to 'main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad')
-rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs index 623324ebb2..5725c9dcb4 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs @@ -336,7 +336,7 @@ namespace MonoDevelop.Ide.Gui.Pads.ProjectPad var project = file.Project; var inFolder = project.Files.GetFilesInVirtualPath (file.ProjectVirtualPath.ParentDirectory).ToList (); - if (inFolder.Count == 1 && inFolder [0] == file) { + if (inFolder.Count == 1 && inFolder [0] == file && project.Files.GetFileWithVirtualPath (file.ProjectVirtualPath.ParentDirectory) == null) { // This is the last project file in the folder. Make sure we keep // a reference to the folder, so it is not deleted from the tree. var folderFile = new ProjectFile (project.BaseDirectory.Combine (file.ProjectVirtualPath.ParentDirectory)); |