summaryrefslogtreecommitdiff
path: root/src/SMAPI/Framework/ModLoading/ModResolver.cs
diff options
context:
space:
mode:
authorJesse Plamondon-Willard <github@jplamondonw.com>2018-08-19 20:27:28 -0400
committerJesse Plamondon-Willard <github@jplamondonw.com>2018-08-19 20:27:28 -0400
commit100e303b488a36e8410ff67e32c35bff80f21ba2 (patch)
tree53ec306a14025726c35c8cebf0bd72370abf996e /src/SMAPI/Framework/ModLoading/ModResolver.cs
parent826dd53ab550e5b92796c510569118beee6bd044 (diff)
downloadSMAPI-100e303b488a36e8410ff67e32c35bff80f21ba2.tar.gz
SMAPI-100e303b488a36e8410ff67e32c35bff80f21ba2.tar.bz2
SMAPI-100e303b488a36e8410ff67e32c35bff80f21ba2.zip
add recursive mod search (#583)
Diffstat (limited to 'src/SMAPI/Framework/ModLoading/ModResolver.cs')
-rw-r--r--src/SMAPI/Framework/ModLoading/ModResolver.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/SMAPI/Framework/ModLoading/ModResolver.cs b/src/SMAPI/Framework/ModLoading/ModResolver.cs
index 09880d03..11518444 100644
--- a/src/SMAPI/Framework/ModLoading/ModResolver.cs
+++ b/src/SMAPI/Framework/ModLoading/ModResolver.cs
@@ -35,7 +35,7 @@ namespace StardewModdingAPI.Framework.ModLoading
if (string.IsNullOrWhiteSpace(displayName))
displayName = dataRecord?.DisplayName;
if (string.IsNullOrWhiteSpace(displayName))
- displayName = PathUtilities.GetRelativePath(rootPath, folder.ActualDirectory?.FullName ?? folder.SearchDirectory.FullName);
+ displayName = PathUtilities.GetRelativePath(rootPath, folder.Directory.FullName);
// apply defaults
if (manifest != null && dataRecord != null)
@@ -48,7 +48,7 @@ namespace StardewModdingAPI.Framework.ModLoading
ModMetadataStatus status = folder.ManifestParseError == null
? ModMetadataStatus.Found
: ModMetadataStatus.Failed;
- yield return new ModMetadata(displayName, folder.ActualDirectory?.FullName, manifest, dataRecord).SetStatus(status, folder.ManifestParseError);
+ yield return new ModMetadata(displayName, folder.Directory.FullName, manifest, dataRecord).SetStatus(status, folder.ManifestParseError);
}
}