GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Minor tweaks

Browse Source
This commit is contained in:
Wojciech Figat
2023-01-05 11:32:25 +01:00
parent b21aeedae2
commit 34cc546f00
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Engine/Engine/NativeInterop.cs
View File

@@ -2476,6 +2476,8 @@ namespace FlaxEngine
{
assembly = scriptingAssemblyLoadContext.LoadFromStream(stream);
}
if (assembly == null)
return new ManagedHandle();
NativeLibrary.SetDllImportResolver(assembly, NativeLibraryImportResolver);
// Assemblies loaded via streams have no Location: https://github.com/dotnet/runtime/issues/12822
@@ -2492,7 +2494,11 @@ namespace FlaxEngine
string name = Marshal.PtrToStringAnsi(name_);
Assembly assembly = AppDomain.CurrentDomain.GetAssemblies().FirstOrDefault(x => x.GetName().Name == name);
if (assembly == null)
{
assembly = scriptingAssemblyLoadContext.Assemblies.FirstOrDefault(x => x.GetName().Name == name);
if (assembly == null)
return new ManagedHandle();
}
*assemblyName = NativeAllocStringAnsi(assembly.GetName().Name);
*assemblyFullName = NativeAllocStringAnsi(assembly.FullName);
@@ -2565,8 +2571,11 @@ namespace FlaxEngine
Assembly assembly = null;
assembly = scriptingAssemblyLoadContext.Assemblies.FirstOrDefault(x => x.FullName == assemblyName);
if (assembly == null)
{
assembly = System.AppDomain.CurrentDomain.GetAssemblies().First(x => x.FullName == assemblyName);
if (assembly == null)
return new ManagedHandle();
}
return ManagedHandle.Alloc(assembly);
}