summaryrefslogtreecommitdiff
path: root/src/SMAPI/Framework/ModLoading
diff options
context:
space:
mode:
authorJesse Plamondon-Willard <github@jplamondonw.com>2018-01-24 11:44:28 -0500
committerJesse Plamondon-Willard <github@jplamondonw.com>2018-01-24 11:44:28 -0500
commit0da5dab8932c53ba39f2290268294e9a72b9c5bb (patch)
tree9302a2a53a68202ac97e86662394a509df499541 /src/SMAPI/Framework/ModLoading
parent15d4b6310e3dd15c62f3faedbf1290b2db26fb59 (diff)
parent5c96a10da5801049ee17ffa185dbf19e6d8a2306 (diff)
downloadSMAPI-0da5dab8932c53ba39f2290268294e9a72b9c5bb.tar.gz
SMAPI-0da5dab8932c53ba39f2290268294e9a72b9c5bb.tar.bz2
SMAPI-0da5dab8932c53ba39f2290268294e9a72b9c5bb.zip
Merge branch 'develop' into stable
Diffstat (limited to 'src/SMAPI/Framework/ModLoading')
-rw-r--r--src/SMAPI/Framework/ModLoading/AssemblyLoader.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/SMAPI/Framework/ModLoading/AssemblyLoader.cs b/src/SMAPI/Framework/ModLoading/AssemblyLoader.cs
index 1e3c4a05..3a7b214a 100644
--- a/src/SMAPI/Framework/ModLoading/AssemblyLoader.cs
+++ b/src/SMAPI/Framework/ModLoading/AssemblyLoader.cs
@@ -162,7 +162,11 @@ namespace StardewModdingAPI.Framework.ModLoading
// skip if already visited
if (visitedAssemblyNames.Contains(assembly.Name.Name))
+ {
yield return new AssemblyParseResult(file, null, AssemblyLoadStatus.AlreadyLoaded);
+ yield break;
+ }
+
visitedAssemblyNames.Add(assembly.Name.Name);
// yield referenced assemblies