From 141541bc1fc107c29930e14b7b46c2d70870056d Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz@gmail.com>
Date: Mon, 29 Jun 2020 14:46:20 +1000
Subject: [PATCH] Pass delegates instead of MainForm to RewindConfig

---
 src/BizHawk.Client.EmuHawk/MainForm.Events.cs |  2 +-
 .../config/RewindConfig.cs                    | 29 ++++++++++++-------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/BizHawk.Client.EmuHawk/MainForm.Events.cs b/src/BizHawk.Client.EmuHawk/MainForm.Events.cs
index 19fe64ff72..ba392a8571 100644
--- a/src/BizHawk.Client.EmuHawk/MainForm.Events.cs
+++ b/src/BizHawk.Client.EmuHawk/MainForm.Events.cs
@@ -1007,7 +1007,7 @@ namespace BizHawk.Client.EmuHawk
 		{
 			if (Emulator.HasSavestates())
 			{
-				using var form = new RewindConfig(this, Config, Emulator.AsStatable());
+				using var form = new RewindConfig(Config, CreateRewinder, () => this.Rewinder, Emulator.AsStatable());
 				AddOnScreenMessage(form.ShowDialog().IsOk()
 					? "Rewind and State settings saved"
 					: "Rewind config aborted");
diff --git a/src/BizHawk.Client.EmuHawk/config/RewindConfig.cs b/src/BizHawk.Client.EmuHawk/config/RewindConfig.cs
index efe983e0f7..14dd099f0e 100644
--- a/src/BizHawk.Client.EmuHawk/config/RewindConfig.cs
+++ b/src/BizHawk.Client.EmuHawk/config/RewindConfig.cs
@@ -8,16 +8,21 @@ namespace BizHawk.Client.EmuHawk
 {
 	public partial class RewindConfig : Form
 	{
-		private readonly MainForm _mainForm;
-		private readonly Config _config;
-		private readonly IStatable _statableCore;
-
 		private double _avgStateSize;
 
-		public RewindConfig(MainForm mainForm, Config config, IStatable statableCore)
+		private readonly Config _config;
+
+		private readonly Action _recreateRewinder;
+
+		private readonly Func<IRewinder> _getRewinder;
+
+		private readonly IStatable _statableCore;
+
+		public RewindConfig(Config config, Action recreateRewinder, Func<IRewinder> getRewinder, IStatable statableCore)
 		{
-			_mainForm = mainForm;
 			_config = config;
+			_recreateRewinder = recreateRewinder;
+			_getRewinder = getRewinder;
 			_statableCore = statableCore;
 			InitializeComponent();
 			btnResetCompression.Image = Properties.Resources.reboot;
@@ -25,11 +30,13 @@ namespace BizHawk.Client.EmuHawk
 
 		private void RewindConfig_Load(object sender, EventArgs e)
 		{
-			if (_mainForm.Rewinder?.Active == true)
+			//TODO can this be moved to the ctor post-InitializeComponent?
+			var rewinder = _getRewinder();
+			if (rewinder?.Active == true)
 			{
-				FullnessLabel.Text = $"{_mainForm.Rewinder.FullnessRatio * 100:0.00}%";
-				RewindFramesUsedLabel.Text = _mainForm.Rewinder.Count.ToString();
-				_avgStateSize = _mainForm.Rewinder.Size * _mainForm.Rewinder.FullnessRatio / _mainForm.Rewinder.Count;
+				FullnessLabel.Text = $"{rewinder.FullnessRatio * 100:0.00}%";
+				RewindFramesUsedLabel.Text = rewinder.Count.ToString();
+				_avgStateSize = rewinder.Size * rewinder.FullnessRatio / rewinder.Count;
 			}
 			else
 			{
@@ -117,7 +124,7 @@ namespace BizHawk.Client.EmuHawk
 
 			if (TriggerRewindSettingsReload)
 			{
-				_mainForm.CreateRewinder();
+				_recreateRewinder();
 			}
 
 			DialogResult = DialogResult.OK;