From c5380ddb5e530a1e77bc643c025af1ea72d891b4 Mon Sep 17 00:00:00 2001 From: Brian Fiete Date: Fri, 4 Sep 2020 09:53:28 -0700 Subject: [PATCH] Fixed dependency-of-dependency issue --- IDE/src/Project.bf | 4 ++-- IDE/src/ui/ProjectProperties.bf | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/IDE/src/Project.bf b/IDE/src/Project.bf index f7ecf435..fb6142b6 100644 --- a/IDE/src/Project.bf +++ b/IDE/src/Project.bf @@ -2257,7 +2257,7 @@ namespace IDE } } - public bool HasDependency(String projectName) + public bool HasDependency(String projectName, bool checkRecursively = true) { HashSet checkedProject = scope .(); @@ -2271,7 +2271,7 @@ namespace IDE if (dependency.mProjectName == projectName) return true; let depProject = gApp.mWorkspace.FindProject(dependency.mProjectName); - if ((depProject != null) && (CheckDependency(depProject))) + if ((depProject != null) && (checkRecursively) && (CheckDependency(depProject))) return true; } return false; diff --git a/IDE/src/ui/ProjectProperties.bf b/IDE/src/ui/ProjectProperties.bf index 20ec75b5..ffdb9276 100644 --- a/IDE/src/ui/ProjectProperties.bf +++ b/IDE/src/ui/ProjectProperties.bf @@ -708,7 +708,7 @@ namespace IDE.ui for (var projectName in projectNames) { var dependencyContainer = new ValueContainer(); - dependencyContainer.mValue = mProject.HasDependency(projectName); + dependencyContainer.mValue = mProject.HasDependency(projectName, false); mDependencyValuesMap[new String(projectName)] = dependencyContainer; var (listViewItem, propItem) = AddPropertiesItem(category, projectName);