prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #407 from Flow-Launcher/fixConcurrentAccessIssue

Browse source 
Fix concurrent access issue
This commit is contained in:
Jeremy Wu 2021-04-14 21:43:59 +10:00 committed by GitHub
commit 0b0a185596
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Flow.Launcher.Core/Plugin/PluginAssemblyLoader.cs
View file

@ -1,5 +1,6 @@
using Flow.Launcher.Infrastructure;
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.IO;
using System.Linq;
@ -14,14 +15,17 @@ namespace Flow.Launcher.Core.Plugin
private readonly AssemblyName assemblyName;
private static readonly List<Assembly> loadedAssembly;
private static readonly ConcurrentDictionary<string, byte> loadedAssembly;
static PluginAssemblyLoader()
{
loadedAssembly = new List<Assembly>(AppDomain.CurrentDomain.GetAssemblies());
var currentAssemblies = AppDomain.CurrentDomain.GetAssemblies();
loadedAssembly = new ConcurrentDictionary<string, byte>(
currentAssemblies.Select(x => new KeyValuePair<string, byte>(x.FullName, default)));
AppDomain.CurrentDomain.AssemblyLoad += (sender, args) =>
{
loadedAssembly.Add(args.LoadedAssembly);
loadedAssembly[args.LoadedAssembly.FullName] = default;
};
}
@ -57,9 +61,7 @@ namespace Flow.Launcher.Core.Plugin
internal bool ExistsInReferencedPackage(AssemblyName assemblyName)
{
if (loadedAssembly.Any(a => a.FullName == assemblyName.FullName))
return true;
return false;
return loadedAssembly.ContainsKey(assemblyName.FullName);
}
}
}