summaryrefslogtreecommitdiff
path: root/src/SMAPI/Framework/SCore.cs
diff options
context:
space:
mode:
authorJesse Plamondon-Willard <Pathoschild@users.noreply.github.com>2021-08-26 01:13:36 -0400
committerJesse Plamondon-Willard <Pathoschild@users.noreply.github.com>2021-08-26 01:13:36 -0400
commit4ee96a20bb6c74bc7ff6176a03e7f15d47cddfa8 (patch)
tree73f1048faacdedc941a561cd74240a1c449fc230 /src/SMAPI/Framework/SCore.cs
parentc95de4e109203e45d07a35a448c21ee43eb976f3 (diff)
parentc065675604a1d93f55828be6030baa3131dd7553 (diff)
downloadSMAPI-4ee96a20bb6c74bc7ff6176a03e7f15d47cddfa8.tar.gz
SMAPI-4ee96a20bb6c74bc7ff6176a03e7f15d47cddfa8.tar.bz2
SMAPI-4ee96a20bb6c74bc7ff6176a03e7f15d47cddfa8.zip
Merge branch 'develop' into stable
Diffstat (limited to 'src/SMAPI/Framework/SCore.cs')
-rw-r--r--src/SMAPI/Framework/SCore.cs14
1 files changed, 4 insertions, 10 deletions
diff --git a/src/SMAPI/Framework/SCore.cs b/src/SMAPI/Framework/SCore.cs
index dff0fc55..c1aa3721 100644
--- a/src/SMAPI/Framework/SCore.cs
+++ b/src/SMAPI/Framework/SCore.cs
@@ -1708,16 +1708,6 @@ namespace StardewModdingAPI.Framework
IManifest manifest = mod.Manifest;
string assemblyPath = Path.Combine(mod.DirectoryPath, manifest.EntryDll);
- // assert 64-bit
-#if SMAPI_FOR_WINDOWS_64BIT_HACK
- if (!EnvironmentUtility.Is64BitAssembly(assemblyPath))
- {
- errorReasonPhrase = "it needs to be updated for 64-bit mode.";
- failReason = ModFailReason.LoadFailed;
- return false;
- }
-#endif
-
// load mod
Assembly modAssembly;
try
@@ -1741,6 +1731,10 @@ namespace StardewModdingAPI.Framework
catch (Exception ex)
{
errorReasonPhrase = "its DLL couldn't be loaded.";
+#if SMAPI_FOR_WINDOWS_64BIT_HACK
+ if (!EnvironmentUtility.Is64BitAssembly(assemblyPath))
+ errorReasonPhrase = "it needs to be updated for 64-bit mode.";
+#endif
errorDetails = $"Error: {ex.GetLogSummary()}";
failReason = ModFailReason.LoadFailed;
return false;