Skip to content

Bugfix: Crash when trying to open an assembly which is already open #127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
adimitrov04 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bugfix: Crash when trying to open an assembly which is already open #127

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions src/CodemerxDecompile/ViewModels/MainWindowViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ private async Task OpenFile()

if (files.Count == 0)
return;

_ = analyticsService.TrackEventAsync(AnalyticsEvents.OpenFile);

LoadAssemblies(files.Select(file => file.Path.LocalPath));
Expand Down Expand Up @@ -300,6 +300,7 @@ internal void LoadAssemblies(IEnumerable<string> filePaths)
// TODO: Rebuild all reference nodes upon loading of a new assembly
// TODO: Invalidate search results
AssemblyNode? firstLoadedAssemblyNode = null;
var alreadyLoadedAssemblyNames = new List<string>();

foreach (var filePath in filePaths)
{
Expand Down Expand Up @@ -348,6 +349,13 @@ internal void LoadAssemblies(IEnumerable<string> filePaths)
var assembly = GlobalAssemblyResolver.Instance.GetAssemblyDefinition(filePath);
if (assembly == null)
continue;

var assemblyName = assembly.Name.Name;
if (AssemblyNodes.Select(node => node.Name).Contains(assemblyName))
{
alreadyLoadedAssemblyNames.Add(assemblyName);
continue;
}

if (hasAccessToDirectory)
{
Expand Down Expand Up @@ -413,8 +421,17 @@ internal void LoadAssemblies(IEnumerable<string> filePaths)
assemblies.Add(assembly);
ClearAssemblyListCommand.NotifyCanExecuteChanged();
}

SelectedNode = firstLoadedAssemblyNode ?? SelectedNode;

SelectedNode = firstLoadedAssemblyNode;
if (alreadyLoadedAssemblyNames.Any())
{
notificationService.ShowNotification(new()
{
Message = $"The following assemblies are already open:\n" + string.Join(",\n", alreadyLoadedAssemblyNames),
Level = NotificationLevel.Error
});
}

TypeNode BuildTypeSubtree(TypeDefinition typeDefinition, Node parentNode)
{
Expand Down