summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/release-notes.md4
-rw-r--r--src/SMAPI/Framework/ModLoading/AssemblyLoader.cs4
2 files changed, 8 insertions, 0 deletions
diff --git a/docs/release-notes.md b/docs/release-notes.md
index 165e7d4e..aaa6d3cc 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -1,4 +1,8 @@
# Release notes
+## 2.4
+* For players:
+ * Fixed rare issues caused by assembly references being incorrectly loaded twice.
+
## 2.3
* For players:
* Added a user-friendly [download page](https://smapi.io).
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