Skip to content

Commit b4ea011

Browse files
committed
Fix name collisions if multiple projects open on startup.
1 parent f0d4885 commit b4ea011

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

Rubberduck.Core/CodeAnalysis/CodeMetrics/CodeMetricsViewModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ private void Synchronize(List<Declaration> declarations)
8484

8585
foreach (var project in adding)
8686
{
87-
var model = new CodeExplorerProjectViewModel(project, declarations, _state, _vbe, false);
87+
var model = new CodeExplorerProjectViewModel(project, declarations.Where(proj => proj.ProjectId.Equals(project.ProjectId)).ToList(), _state, _vbe, false);
8888
Projects.Add(model);
8989
model.IsExpanded = true;
9090
}

Rubberduck.Core/Navigation/CodeExplorer/CodeExplorerViewModel.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,9 +266,8 @@ private void Synchronize(List<Declaration> declarations)
266266

267267
foreach (var project in adding)
268268
{
269-
var model = new CodeExplorerProjectViewModel(project, declarations, _state, _vbe);
269+
var model = new CodeExplorerProjectViewModel(project, declarations.Where(proj => proj.ProjectId.Equals(project.ProjectId)).ToList(), _state, _vbe);
270270
Projects.Add(model);
271-
//model.IsExpanded = true;
272271
}
273272

274273
CanSearch = Projects.Any();

0 commit comments

Comments
 (0)