diff options
| author | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2020-09-08 18:17:09 -0400 |
|---|---|---|
| committer | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2020-09-08 18:17:09 -0400 |
| commit | 5433f9023ed174366c8bf450785aafbdb077d29d (patch) | |
| tree | 3a4fc71371d5a1194c2f819444aa7fc32f739830 /src/SMAPI/Framework/Content | |
| parent | 8a51279ce943ff74b45ec7af308ecf59d73ace9b (diff) | |
| parent | d53e033163cfc4a876d6a3341979315a3d937a4f (diff) | |
| download | SMAPI-5433f9023ed174366c8bf450785aafbdb077d29d.tar.gz SMAPI-5433f9023ed174366c8bf450785aafbdb077d29d.tar.bz2 SMAPI-5433f9023ed174366c8bf450785aafbdb077d29d.zip | |
Merge branch 'develop' into stable
Diffstat (limited to 'src/SMAPI/Framework/Content')
| -rw-r--r-- | src/SMAPI/Framework/Content/AssetDataForMap.cs | 2 | ||||
| -rw-r--r-- | src/SMAPI/Framework/Content/ContentCache.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/SMAPI/Framework/Content/AssetDataForMap.cs b/src/SMAPI/Framework/Content/AssetDataForMap.cs index e80c6e53..20f0ed0f 100644 --- a/src/SMAPI/Framework/Content/AssetDataForMap.cs +++ b/src/SMAPI/Framework/Content/AssetDataForMap.cs @@ -153,7 +153,7 @@ namespace StardewModdingAPI.Framework.Content if (string.IsNullOrWhiteSpace(path)) return string.Empty; - path = PathUtilities.NormalizePathSeparators(path.Trim()); + path = PathUtilities.NormalizePath(path); if (path.StartsWith($"Maps{PathUtilities.PreferredPathSeparator}", StringComparison.OrdinalIgnoreCase)) path = path.Substring($"Maps{PathUtilities.PreferredPathSeparator}".Length); if (path.EndsWith(".png", StringComparison.OrdinalIgnoreCase)) diff --git a/src/SMAPI/Framework/Content/ContentCache.cs b/src/SMAPI/Framework/Content/ContentCache.cs index 2052f6bf..af65e07e 100644 --- a/src/SMAPI/Framework/Content/ContentCache.cs +++ b/src/SMAPI/Framework/Content/ContentCache.cs @@ -80,7 +80,7 @@ namespace StardewModdingAPI.Framework.Content [Pure] public string NormalizePathSeparators(string path) { - return PathUtilities.NormalizePathSeparators(path); + return PathUtilities.NormalizePath(path); } /// <summary>Normalize a cache key so it's consistent with the underlying cache.</summary> |