From c4f2bed9fd1e7541f5b58a88f7dc54135666d02c Mon Sep 17 00:00:00 2001
From: CasualPokePlayer <50538166+CasualPokePlayer@users.noreply.github.com>
Date: Thu, 26 Jan 2023 08:00:43 -0800
Subject: [PATCH] sledgehammer fix any remaining issues with RAIntegration

---
 .../RetroAchievements/RAIntegration.Update.cs | 20 +++++++++++++++----
 .../RetroAchievements/RAIntegration.cs        | 15 ++++++--------
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/BizHawk.Client.EmuHawk/RetroAchievements/RAIntegration.Update.cs b/src/BizHawk.Client.EmuHawk/RetroAchievements/RAIntegration.Update.cs
index f7c1c347e9..d9d778a93f 100644
--- a/src/BizHawk.Client.EmuHawk/RetroAchievements/RAIntegration.Update.cs
+++ b/src/BizHawk.Client.EmuHawk/RetroAchievements/RAIntegration.Update.cs
@@ -12,23 +12,35 @@ namespace BizHawk.Client.EmuHawk
 {
 	public partial class RAIntegration
 	{
+		private static RAInterface _RA;
 		private static DynamicLibraryImportResolver _resolver;
 		private static Version _version;
+		
+		public static bool IsAvailable => _RA != null;
+
+		// can't have both a proxy with a monitor and without one, so...
+		private class DummyMonitor : IMonitor
+		{
+			public void Enter() {}
+			public void Exit() {}
+
+			public static readonly DummyMonitor Singleton = new();
+		}
 
 		private static void AttachDll()
 		{
 			_resolver = new("RA_Integration-x64.dll", hasLimitedLifetime: true);
-			RA = BizInvoker.GetInvoker<RAInterface>(_resolver, CallingConventionAdapters.Native);
-			_version = new(Marshal.PtrToStringAnsi(RA.IntegrationVersion())!);
+			_RA = BizInvoker.GetInvoker<RAInterface>(_resolver, DummyMonitor.Singleton, CallingConventionAdapters.Native);
+			_version = new(Marshal.PtrToStringAnsi(_RA.IntegrationVersion())!);
 			Console.WriteLine($"Loaded RetroAchievements v{_version}");
 		}
 
 		private static void DetachDll()
 		{
-			RA?.Shutdown();
+			_RA?.Shutdown();
 			_resolver?.Dispose();
 			_resolver = null;
-			RA = null;
+			_RA = null;
 			_version = new(0, 0);
 		}
 
diff --git a/src/BizHawk.Client.EmuHawk/RetroAchievements/RAIntegration.cs b/src/BizHawk.Client.EmuHawk/RetroAchievements/RAIntegration.cs
index 67e026e936..4363954264 100644
--- a/src/BizHawk.Client.EmuHawk/RetroAchievements/RAIntegration.cs
+++ b/src/BizHawk.Client.EmuHawk/RetroAchievements/RAIntegration.cs
@@ -5,6 +5,7 @@ using System.Text;
 using System.Threading;
 using System.Windows.Forms;
 
+using BizHawk.BizInvoke;
 using BizHawk.Common;
 using BizHawk.Client.Common;
 using BizHawk.Emulation.Common;
@@ -13,9 +14,8 @@ namespace BizHawk.Client.EmuHawk
 {
 	public partial class RAIntegration : RetroAchievements
 	{
-		private static RAInterface RA;
-		public static bool IsAvailable => RA != null;
-
+		private readonly RAInterface RA;
+		
 		static RAIntegration()
 		{
 			try
@@ -116,6 +116,8 @@ namespace BizHawk.Client.EmuHawk
 		{
 			_memGuard = new(_memLock, _memSema, _memSync);
 			_memAccess = new(_memLock, _memSema, _memSync);
+			
+			RA = BizInvoker.GetInvoker<RAInterface>(_resolver, _memAccess, CallingConventionAdapters.Native);
 
 			RA.InitClient(_mainForm.Handle, "BizHawk", VersionInfo.GetEmuVersion());
 
@@ -153,11 +155,10 @@ namespace BizHawk.Client.EmuHawk
 				HandleHardcoreModeDisable("Loading savestates is not allowed in hardcore mode.");
 			}
 
-			using var access = _memAccess.EnterExit();
 			RA.OnLoadState(path);
 		}
 		
-		private static void QuickLoadCallback(object _, BeforeQuickLoadEventArgs e)
+		private void QuickLoadCallback(object _, BeforeQuickLoadEventArgs e)
 		{
 			if (RA.HardcoreModeIsActive())
 			{
@@ -236,8 +237,6 @@ namespace BizHawk.Client.EmuHawk
 
 		public override void Update()
 		{
-			using var access = _memAccess.EnterExit();
-
 			if (RA.HardcoreModeIsActive())
 			{
 				CheckHardcoreModeConditions();
@@ -268,8 +267,6 @@ namespace BizHawk.Client.EmuHawk
 
 		public override void OnFrameAdvance()
 		{
-			using var access = _memAccess.EnterExit();
-
 			var input = _inputManager.ControllerOutput;
 			if (input.Definition.BoolButtons.Any(b => (b.Contains("Power") || b.Contains("Reset")) && input.IsPressed(b)))
 			{