From b6cc17112d95345de83348dd918ed1f7711926f4 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Mon, 19 Feb 2018 20:22:01 -0500
Subject: normalise path separators in read/write JSON file methods exposed to
 mods

---
 src/SMAPI/Framework/ContentPack.cs          | 3 ++-
 src/SMAPI/Framework/ModHelpers/ModHelper.cs | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/SMAPI')

diff --git a/src/SMAPI/Framework/ContentPack.cs b/src/SMAPI/Framework/ContentPack.cs
index 0a8f223e..071fb872 100644
--- a/src/SMAPI/Framework/ContentPack.cs
+++ b/src/SMAPI/Framework/ContentPack.cs
@@ -3,6 +3,7 @@ using System.IO;
 using Microsoft.Xna.Framework.Content;
 using Microsoft.Xna.Framework.Graphics;
 using StardewModdingAPI.Framework.Serialisation;
+using StardewModdingAPI.Framework.Utilities;
 using xTile;
 
 namespace StardewModdingAPI.Framework
@@ -52,7 +53,7 @@ namespace StardewModdingAPI.Framework
         /// <returns>Returns the deserialised model, or <c>null</c> if the file doesn't exist or is empty.</returns>
         public TModel ReadJsonFile<TModel>(string path) where TModel : class
         {
-            path = Path.Combine(this.DirectoryPath, path);
+            path = Path.Combine(this.DirectoryPath, PathUtilities.NormalisePathSeparators(path));
             return this.JsonHelper.ReadJsonFile<TModel>(path);
         }
 
diff --git a/src/SMAPI/Framework/ModHelpers/ModHelper.cs b/src/SMAPI/Framework/ModHelpers/ModHelper.cs
index c73dc307..07dada7e 100644
--- a/src/SMAPI/Framework/ModHelpers/ModHelper.cs
+++ b/src/SMAPI/Framework/ModHelpers/ModHelper.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using StardewModdingAPI.Framework.Serialisation;
+using StardewModdingAPI.Framework.Utilities;
 
 namespace StardewModdingAPI.Framework.ModHelpers
 {
@@ -108,7 +109,7 @@ namespace StardewModdingAPI.Framework.ModHelpers
         public TModel ReadJsonFile<TModel>(string path)
             where TModel : class
         {
-            path = Path.Combine(this.DirectoryPath, path);
+            path = Path.Combine(this.DirectoryPath, PathUtilities.NormalisePathSeparators(path));
             return this.JsonHelper.ReadJsonFile<TModel>(path);
         }
 
@@ -119,7 +120,7 @@ namespace StardewModdingAPI.Framework.ModHelpers
         public void WriteJsonFile<TModel>(string path, TModel model)
             where TModel : class
         {
-            path = Path.Combine(this.DirectoryPath, path);
+            path = Path.Combine(this.DirectoryPath, PathUtilities.NormalisePathSeparators(path));
             this.JsonHelper.WriteJsonFile(path, model);
         }
 
-- 
cgit