Merge branch 'content-bug-fix' of https://github.com/Tryibion/FlaxEngine into Tryibion-content-bug-fix

This commit is contained in:
Wojtek Figat
2023-04-17 12:29:03 +02:00

View File

@@ -539,7 +539,7 @@ namespace FlaxEditor.Windows
destinationName = StringUtils.IncrementNameNumber(item.ShortName, x => !File.Exists(StringUtils.CombinePaths(sourceFolder, x + extension))) + extension; destinationName = StringUtils.IncrementNameNumber(item.ShortName, x => !File.Exists(StringUtils.CombinePaths(sourceFolder, x + extension))) + extension;
} }
return StringUtils.CombinePaths(sourceFolder, destinationName); return StringUtils.NormalizePath(StringUtils.CombinePaths(sourceFolder, destinationName));
} }
/// <summary> /// <summary>
@@ -566,6 +566,7 @@ namespace FlaxEditor.Windows
// Start renaming it // Start renaming it
if (targetItem != null) if (targetItem != null)
{ {
Select(targetItem);
Rename(targetItem); Rename(targetItem);
} }
} }