summaryrefslogtreecommitdiff
path: root/src/StardewModdingAPI.Toolkit/Framework
diff options
context:
space:
mode:
authorJesse Plamondon-Willard <github@jplamondonw.com>2018-08-11 20:33:21 -0400
committerJesse Plamondon-Willard <github@jplamondonw.com>2018-08-11 20:33:21 -0400
commitb7907293349e95f84583e682f38e0eb491ac2e5d (patch)
tree3a2e2405729eb3a42b036049957ad741e9968f83 /src/StardewModdingAPI.Toolkit/Framework
parentef731de8318c7f01567baf2e23ae9a09789b4bdd (diff)
downloadSMAPI-b7907293349e95f84583e682f38e0eb491ac2e5d.tar.gz
SMAPI-b7907293349e95f84583e682f38e0eb491ac2e5d.tar.bz2
SMAPI-b7907293349e95f84583e682f38e0eb491ac2e5d.zip
add support for loading unpacked .json files through content API (#576)
Diffstat (limited to 'src/StardewModdingAPI.Toolkit/Framework')
-rw-r--r--src/StardewModdingAPI.Toolkit/Framework/ModScanning/ModScanner.cs3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/StardewModdingAPI.Toolkit/Framework/ModScanning/ModScanner.cs b/src/StardewModdingAPI.Toolkit/Framework/ModScanning/ModScanner.cs
index de8d0f02..f1cce4a4 100644
--- a/src/StardewModdingAPI.Toolkit/Framework/ModScanning/ModScanner.cs
+++ b/src/StardewModdingAPI.Toolkit/Framework/ModScanning/ModScanner.cs
@@ -51,8 +51,7 @@ namespace StardewModdingAPI.Toolkit.Framework.ModScanning
{
try
{
- manifest = this.JsonHelper.ReadJsonFile<Manifest>(manifestFile.FullName);
- if (manifest == null)
+ if (!this.JsonHelper.ReadJsonFileIfExists<Manifest>(manifestFile.FullName, out manifest))
manifestError = "its manifest is invalid.";
}
catch (SParseException ex)