Skip to content

Commit

Permalink
Merge pull request #85504 from nongvantinh/fix-csharp-loader
Browse files Browse the repository at this point in the history
Fix C# script loader does not work reliably
  • Loading branch information
akien-mga committed Jan 26, 2024
2 parents 5034478 + 7676e38 commit d36f5cf
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion modules/mono/csharp_script.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2897,8 +2897,11 @@ Ref<Resource> ResourceFormatLoaderCSharpScript::load(const String &p_path, const
ERR_FAIL_COND_V_MSG(err != OK, Ref<Resource>(), "Cannot load C# script file '" + p_path + "'.");
#endif

scr->set_path(p_original_path);
// Only one instance of a C# script is allowed to exist.
ERR_FAIL_COND_V_MSG(!scr->get_path().is_empty() && scr->get_path() != p_original_path, Ref<Resource>(),
"The C# script path is different from the path it was registered in the C# dictionary.");

scr->set_path(p_original_path, true);
scr->reload();

if (r_error) {
Expand Down

0 comments on commit d36f5cf

Please sign in to comment.