diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-05-22 09:16:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-22 09:16:26 +0200 |
| commit | 07ada02cb44af22905991b558af6a4a531de44a7 (patch) | |
| tree | 8f02cf1e6eb3c15529367e33b98ab49054c9cee5 /modules | |
| parent | bbd2115cb4d69e7924b8d41030e3ce6ec0ac7c3b (diff) | |
| parent | d7e21ecd63a984054c6bd330ee8ff6de5e53de7d (diff) | |
Merge pull request #38943 from neikeq/yakamashi
Mono/C#: Don't try to load project assembly in project manager
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/mono/mono_gd/gd_mono.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/modules/mono/mono_gd/gd_mono.cpp b/modules/mono/mono_gd/gd_mono.cpp index 080f366692..5f518d0613 100644 --- a/modules/mono/mono_gd/gd_mono.cpp +++ b/modules/mono/mono_gd/gd_mono.cpp @@ -424,6 +424,9 @@ void GDMono::initialize_load_assemblies() { CRASH_COND_MSG(!tool_assemblies_loaded, "Mono: Failed to load '" TOOLS_ASM_NAME "' assemblies."); #endif + if (Main::is_project_manager()) + return; + // Load the project's main assembly. This doesn't necessarily need to succeed. // The game may not be using .NET at all, or if the project does use .NET and // we're running in the editor, it may just happen to be it wasn't built yet. |