From b4ea011ad53074744289140b3c4096015924a05b Mon Sep 17 00:00:00 2001 From: comintern Date: Wed, 16 Jan 2019 21:19:59 -0600 Subject: [PATCH] Fix name collisions if multiple projects open on startup. --- .../CodeAnalysis/CodeMetrics/CodeMetricsViewModel.cs | 2 +- .../Navigation/CodeExplorer/CodeExplorerViewModel.cs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Rubberduck.Core/CodeAnalysis/CodeMetrics/CodeMetricsViewModel.cs b/Rubberduck.Core/CodeAnalysis/CodeMetrics/CodeMetricsViewModel.cs index 377714f20d..70bf09836f 100644 --- a/Rubberduck.Core/CodeAnalysis/CodeMetrics/CodeMetricsViewModel.cs +++ b/Rubberduck.Core/CodeAnalysis/CodeMetrics/CodeMetricsViewModel.cs @@ -84,7 +84,7 @@ private void Synchronize(List declarations) foreach (var project in adding) { - var model = new CodeExplorerProjectViewModel(project, declarations, _state, _vbe, false); + var model = new CodeExplorerProjectViewModel(project, declarations.Where(proj => proj.ProjectId.Equals(project.ProjectId)).ToList(), _state, _vbe, false); Projects.Add(model); model.IsExpanded = true; } diff --git a/Rubberduck.Core/Navigation/CodeExplorer/CodeExplorerViewModel.cs b/Rubberduck.Core/Navigation/CodeExplorer/CodeExplorerViewModel.cs index 113f9bada1..a968f0292f 100644 --- a/Rubberduck.Core/Navigation/CodeExplorer/CodeExplorerViewModel.cs +++ b/Rubberduck.Core/Navigation/CodeExplorer/CodeExplorerViewModel.cs @@ -266,9 +266,8 @@ private void Synchronize(List declarations) foreach (var project in adding) { - var model = new CodeExplorerProjectViewModel(project, declarations, _state, _vbe); + var model = new CodeExplorerProjectViewModel(project, declarations.Where(proj => proj.ProjectId.Equals(project.ProjectId)).ToList(), _state, _vbe); Projects.Add(model); - //model.IsExpanded = true; } CanSearch = Projects.Any();