Skip to content
Closed
Changes from all commits
Commits
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
10 changes: 7 additions & 3 deletions source/VersionHandlerImpl/src/VersionHandlerImpl.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2350,9 +2350,13 @@ private static bool EnabledEditorDllsLoaded {
var loadedAssemblyPaths = new HashSet<string>();
foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies()) {
try {
var path = Path.GetFullPath(assembly.Location);
if (enabledEditorDlls.Contains(path)) {
loadedAssemblyPaths.Add(path);
if (assembly != null && !String.IsNullOrEmpty(assembly.Location))
{
var path = Path.GetFullPath(assembly.Location);
if (enabledEditorDlls.Contains(path))
{
loadedAssemblyPaths.Add(path);
}
}
} catch (NotSupportedException) {
// Dynamic assemblies do not have a file location so ignore.
Expand Down