From 080343f902a64512dea67032bd5882818d07776c Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Mon, 12 Aug 2019 02:20:09 +1000 Subject: [PATCH] Only check matching assembly versions on Windows Assembly version check shouldn't be necessary if installed with a package manager. --- BizHawk.Client.EmuHawk/Program.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/BizHawk.Client.EmuHawk/Program.cs b/BizHawk.Client.EmuHawk/Program.cs index 4458f2ac75..8da6077bbf 100644 --- a/BizHawk.Client.EmuHawk/Program.cs +++ b/BizHawk.Client.EmuHawk/Program.cs @@ -96,7 +96,8 @@ namespace BizHawk.Client.EmuHawk // this check has to be done VERY early. i stepped through a debug build with wrong .dll versions purposely used, // and there was a TypeLoadException before the first line of SubMain was reached (some static ColorType init?) // zero 25-dec-2012 - only do for public builds. its annoying during development - if (!VersionInfo.DeveloperBuild) + // and don't bother when installed from a package manager i.e. not Windows --yoshi + if (!VersionInfo.DeveloperBuild && EXE_PROJECT.OSTailoredCode.CurrentOS == EXE_PROJECT.OSTailoredCode.DistinctOS.Windows) { var thisversion = typeof(Program).Assembly.GetName().Version; var utilversion = Assembly.Load(new AssemblyName("Bizhawk.Client.Common")).GetName().Version;