Merge branch '2024-09-18-res-path' into 2024-09-14-audio-reloads

# Conflicts: # Robust.Shared/Utility/ResPath.cs
metalgearsloth · Sep 28, 2024 · 361fb8e · 361fb8e
2 parents a27c27a + 432cc49
commit 361fb8e
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/Robust.Shared/Utility/ResPath.cs b/Robust.Shared/Utility/ResPath.cs
@@ -65,7 +65,9 @@ namespace Robust.Shared.Utility;
 
     public ResPath(string canonPath)
     {
-        CanonPath = canonPath.Replace(Path.DirectorySeparatorChar, Separator);
+        // Paths should never have non-standardised directory separators passed in, the caller should have already sanitised it.
+        DebugTools.Assert(!canonPath.Contains('\\'));
+        CanonPath = canonPath;
     }
 
     /// <summary>