From 85c9b2b5782b258257cd13da4719d8f4f0a2dd68 Mon Sep 17 00:00:00 2001 From: Rejean Loyer Date: Tue, 10 Jun 2014 13:58:18 -0400 Subject: [PATCH 1/1] ide: don't show same file name message if other same-named files are excluded when renaming a file in project view. --- ide/src/dialogs/NodeProperties.ec | 5 ++++- ide/src/project/ProjectNode.ec | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ide/src/dialogs/NodeProperties.ec b/ide/src/dialogs/NodeProperties.ec index 8a835c0..0f7ece0 100644 --- a/ide/src/dialogs/NodeProperties.ec +++ b/ide/src/dialogs/NodeProperties.ec @@ -43,15 +43,18 @@ class NodeProperties : Window { char filePath[MAX_LOCATION]; char * oldName = node.name; + Map exclusionInfo { }; node.name = null; GetLastDirectory(name.contents, filePath); - if(topNode.Find(filePath, false)) + topNode.CollectExclusionInfo(exclusionInfo, null); + if(topNode.FindSameNameConflict(name.contents, false, exclusionInfo, null)) { MessageBox { type = ok, master = this, text = filePath, contents = $"File with same name already in project." }.Modal(); node.name = oldName; return false; } + delete exclusionInfo; delete oldName; node.name = CopyString(filePath); if(node.type == file) diff --git a/ide/src/project/ProjectNode.ec b/ide/src/project/ProjectNode.ec index c92c695..d08873a 100644 --- a/ide/src/project/ProjectNode.ec +++ b/ide/src/project/ProjectNode.ec @@ -1420,7 +1420,7 @@ private: bool ContainsFilesWithExtension(const char * extension, ProjectConfig prjConfig) { - if(type == file) + if(type == file && name && name[0]) { char ext[MAX_EXTENSION]; GetExtension(name, ext); -- 1.8.3.1