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

Fix loading shared managed assemblies multiple times

Browse Source
This commit is contained in:
Ari Vuollet
2023-09-29 22:06:55 +03:00
parent fd3f10864b
commit 18310c9264
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Engine/Scripting/Scripting.cpp
View File

@@ -104,7 +104,7 @@ namespace
MMethod* _method_LateFixedUpdate = nullptr; MMethod* _method_LateFixedUpdate = nullptr;
MMethod* _method_Draw = nullptr; MMethod* _method_Draw = nullptr;
MMethod* _method_Exit = nullptr; MMethod* _method_Exit = nullptr;
Array<BinaryModule*, InlinedAllocation<64>> _nonNativeModules; Dictionary<StringAnsi, BinaryModule*, InlinedAllocation<64>> _nonNativeModules;
#if USE_EDITOR #if USE_EDITOR
bool LastBinariesLoadTriggeredCompilation = false; bool LastBinariesLoadTriggeredCompilation = false;
#endif #endif
@@ -334,6 +334,8 @@ bool Scripting::LoadBinaryModules(const String& path, const String& projectFolde
// Check if that module has been already registered // Check if that module has been already registered
BinaryModule* module = BinaryModule::GetModule(nameAnsi); BinaryModule* module = BinaryModule::GetModule(nameAnsi);
if (!module)
_nonNativeModules.TryGet(nameAnsi, module);
if (!module) if (!module)
{ {
// C++ // C++
@@ -403,7 +405,7 @@ bool Scripting::LoadBinaryModules(const String& path, const String& projectFolde
{ {
// Create module if native library is not used // Create module if native library is not used
module = New<ManagedBinaryModule>(nameAnsi); module = New<ManagedBinaryModule>(nameAnsi);
_nonNativeModules.Add(module); _nonNativeModules.Add(nameAnsi, module);
} }
} }