From 08c234dcf20a73466aec0e4322ad0ec79b4e08e6 Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz@gmail.com>
Date: Sun, 16 Aug 2020 17:28:48 +1000
Subject: [PATCH] Make VirtualPadDiscManager.OwnerEmulator a readonly field and
 cleanup

Did this as a separate commit because it seems like the intent was for
OwnerEmulator to be mutable, though it was only ever set immediately after
creation. Revert to make it mutable again.
---
 .../controls/VirtualPadDiscManager.cs         | 29 ++++---------------
 1 file changed, 6 insertions(+), 23 deletions(-)

diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadDiscManager.cs b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadDiscManager.cs
index d83559bf35..0b9ac0d467 100644
--- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadDiscManager.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadDiscManager.cs
@@ -18,40 +18,24 @@ namespace BizHawk.Client.EmuHawk
 			IReadOnlyList<string> buttonNames)
 		{
 			_stickyXorAdapter = stickyXorAdapter;
+			_ownerEmulator = ownerEmulator;
 			Name = name;
 			InitializeComponent();
 			btnOpen.Name = buttonNames[0];
 			btnClose.Name = buttonNames[1];
 			_discSelectName = buttonNames[2];
 
+			// these need to follow InitializeComponent call
 			UpdateCoreAssociation();
-			OwnerEmulator = ownerEmulator;
+			UpdateValues();
 		}
 
 		private readonly string _discSelectName;
-		private object _lastCoreOwner;
-		private object _ownerEmulator;
-
-		public object OwnerEmulator
-		{
-			get => _ownerEmulator;
-			set
-			{
-				_ownerEmulator = value;
-				UpdateValues();
-			}
-		}
+		private readonly object _ownerEmulator;
 
 		private void UpdateCoreAssociation()
 		{
-			if (_lastCoreOwner == OwnerEmulator)
-			{
-				return;
-			}
-
-			_lastCoreOwner = OwnerEmulator;
-
-			if (!(OwnerEmulator is Octoshock psx))
+			if (!(_ownerEmulator is Octoshock psx))
 			{
 				return;
 			}
@@ -78,8 +62,7 @@ namespace BizHawk.Client.EmuHawk
 
 		public void UpdateValues()
 		{
-			UpdateCoreAssociation();
-			if (OwnerEmulator is Octoshock psx)
+			if (_ownerEmulator is Octoshock psx)
 			{
 				bool eject = psx.CurrentTrayOpen;
 				bool enableDiscs = eject;