From 87a4f1186eaf21719d70d729c8543af07b86e12b Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Thu, 26 Nov 2020 14:21:07 +1000 Subject: [PATCH] Make EmuClientApi.SystemIdConverter a static instance --- src/BizHawk.Client.EmuHawk/Api/Libraries/EmuClientApi.cs | 2 +- src/BizHawk.Client.EmuHawk/tools/ExternalToolManager.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/BizHawk.Client.EmuHawk/Api/Libraries/EmuClientApi.cs b/src/BizHawk.Client.EmuHawk/Api/Libraries/EmuClientApi.cs index 288ffd70dd..8bd42eb68d 100644 --- a/src/BizHawk.Client.EmuHawk/Api/Libraries/EmuClientApi.cs +++ b/src/BizHawk.Client.EmuHawk/Api/Libraries/EmuClientApi.cs @@ -72,7 +72,7 @@ namespace BizHawk.Client.EmuHawk } } - internal readonly BizHawkSystemIdToEnumConverter SystemIdConverter = new BizHawkSystemIdToEnumConverter(); + internal static readonly BizHawkSystemIdToEnumConverter SystemIdConverter = new BizHawkSystemIdToEnumConverter(); private IVideoProvider VideoProvider { get; set; } diff --git a/src/BizHawk.Client.EmuHawk/tools/ExternalToolManager.cs b/src/BizHawk.Client.EmuHawk/tools/ExternalToolManager.cs index 9e3e4f30a7..4c4a7fbbe7 100644 --- a/src/BizHawk.Client.EmuHawk/tools/ExternalToolManager.cs +++ b/src/BizHawk.Client.EmuHawk/tools/ExternalToolManager.cs @@ -98,7 +98,7 @@ namespace BizHawk.Client.EmuHawk item.Tag = (externalToolFile.Location, entryPoint.FullName); // Tag set => no errors (show custom icon even when disabled) if (applicabilityAttrs.Count == 1) { - var system = GlobalWin.ClientApi.SystemIdConverter.Convert(GlobalWin.Emulator.SystemId); + var system = EmuClientApi.SystemIdConverter.Convert(GlobalWin.Emulator.SystemId); if (applicabilityAttrs[0].NotApplicableTo(system)) { item.ToolTipText = system == CoreSystem.Null