godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #41411 from neikeq/fix-rare-wrong-proj-assembly-path

Browse Source 
Mono/C#: Fix editor using wrong project assembly path in rare cases
This commit is contained in:
Rémi Verschelde 2020-08-21 01:58:42 +02:00 committed by GitHub
commit c1e7df15e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/mono/editor/GodotTools/GodotTools.Core/StringExtensions.cs
View File

@ -43,7 +43,7 @@ namespace GodotTools.Core
path.StartsWith(DriveRoot, StringComparison.Ordinal);
}
public static string ToSafeDirName(this string dirName, bool allowDirSeparator)
public static string ToSafeDirName(this string dirName, bool allowDirSeparator = false)
{
var invalidChars = new List<string> { ":", "*", "?", "\"", "<", ">", "|" };

2
modules/mono/editor/GodotTools/GodotTools/Export/ExportPlugin.cs
View File

@ -430,7 +430,7 @@ namespace GodotTools.Export
private static string DetermineDataDirNameForProject()
{
var appName = (string)ProjectSettings.GetSetting("application/config/name");
string appNameSafe = appName.ToSafeDirName(allowDirSeparator: false);
string appNameSafe = appName.ToSafeDirName();
return $"data_{appNameSafe}";
}

1
modules/mono/editor/GodotTools/GodotTools/GodotSharpEditor.cs
View File

@ -45,6 +45,7 @@ namespace GodotTools
get
{
var projectAssemblyName = (string)ProjectSettings.GetSetting("application/config/name");
projectAssemblyName = projectAssemblyName.ToSafeDirName();
if (string.IsNullOrEmpty(projectAssemblyName))
projectAssemblyName = "UnnamedProject";
return projectAssemblyName;