Skip to content

Commit 3667805

Browse files
committed
Merge branch 'AvoidDuplicateAssemblyLoad' of github.com:taooceros/Flow.Launcher into AvoidDuplicateAssemblyLoad
2 parents a4b7bc5 + 81926c0 commit 3667805

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

Flow.Launcher.Core/Plugin/PluginAssemblyLoader.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,8 @@ protected override Assembly Load(AssemblyName assemblyName)
4141
string assemblyPath = dependencyResolver.ResolveAssemblyToPath(assemblyName);
4242

4343
// When resolving dependencies, ignore assembly depenedencies that already exits with Flow.Launcher
44-
// Otherwise duplicate assembly will be loaded, and some weird behavior will occur such as WinRT.dll
45-
// will fail to create
46-
44+
// Otherwise duplicate assembly will be loaded and some weird behavior will occur, such as WinRT.Runtime.dll
45+
// will fail due to loading multiple versions in process, each with their own static instance of registration state
4746
if (assemblyPath == null || ExistsInReferencedPackage(assemblyName))
4847
return null;
4948

0 commit comments

Comments
 (0)