From 92f13ba9ea9f18425c36a2e738cc9102f6151fa9 Mon Sep 17 00:00:00 2001 From: RedworkDE <10944644+RedworkDE@users.noreply.github.com> Date: Mon, 6 Mar 2023 21:39:24 +0100 Subject: C#: Unify project name handling and fix issues with the handling of some special characters Co-authored-by: Raul Santos --- modules/mono/csharp_script.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'modules/mono/csharp_script.cpp') diff --git a/modules/mono/csharp_script.cpp b/modules/mono/csharp_script.cpp index 05595e7e45..28331288d3 100644 --- a/modules/mono/csharp_script.cpp +++ b/modules/mono/csharp_script.cpp @@ -62,6 +62,7 @@ #include "signal_awaiter_utils.h" #include "utils/macros.h" #include "utils/naming_utils.h" +#include "utils/path_utils.h" #include "utils/string_utils.h" #define CACHED_STRING_NAME(m_var) (CSharpLanguage::get_singleton()->get_string_names().m_var) @@ -740,11 +741,7 @@ bool CSharpLanguage::is_assembly_reloading_needed() { return false; // Already up to date } } else { - String assembly_name = GLOBAL_GET("dotnet/project/assembly_name"); - - if (assembly_name.is_empty()) { - assembly_name = ProjectSettings::get_singleton()->get_safe_project_name(); - } + String assembly_name = path::get_csharp_project_name(); assembly_path = GodotSharpDirs::get_res_temp_assemblies_dir() .path_join(assembly_name + ".dll"); -- cgit v1.2.3