From 4e60e164bed899301fb1a280af9473e3028ffa33 Mon Sep 17 00:00:00 2001
From: feos <feos-theos@yandex.ru>
Date: Mon, 4 May 2020 16:48:26 +0300
Subject: [PATCH] mame: deconstruct Update()

---
 .../Arcades/MAME/MAME.cs                       | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/BizHawk.Emulation.Cores/Arcades/MAME/MAME.cs b/src/BizHawk.Emulation.Cores/Arcades/MAME/MAME.cs
index 310d992cff..c535ed9a9b 100644
--- a/src/BizHawk.Emulation.Cores/Arcades/MAME/MAME.cs
+++ b/src/BizHawk.Emulation.Cores/Arcades/MAME/MAME.cs
@@ -631,13 +631,6 @@ namespace BizHawk.Emulation.Cores.Arcades.MAME
 			}
 		}
 
-		private void Update()
-		{
-			UpdateFramerate();
-			UpdateVideo();
-			UpdateAspect();
-		}
-
 		private void UpdateGameName()
 		{
 			_gameName = MameGetString(MAMELuaCommand.GetGameName);
@@ -688,7 +681,7 @@ namespace BizHawk.Emulation.Cores.Arcades.MAME
 			}
 			else if (!_frameDone)
 			{
-				Update();
+				UpdateVideo();
 				_frameDone = true;
 				_mameFrameComplete.Set();
 			}
@@ -729,7 +722,9 @@ namespace BizHawk.Emulation.Cores.Arcades.MAME
 
 			CheckVersions();
 			GetInputFields();
-			Update();
+			UpdateVideo();
+			UpdateAspect();
+			UpdateFramerate();
 			UpdateGameName();
 			InitMemoryDomains();
 
@@ -752,10 +747,6 @@ namespace BizHawk.Emulation.Cores.Arcades.MAME
 				_mameStartupComplete.Set();
 				_loadFailure += data;
 			}
-			else
-			{
-				_loadFailure = "";
-			}
 
 			// mame sends osd_output_channel casted to int, we implicitly cast it back
 			if (!data.Contains("pause = "))
@@ -781,6 +772,7 @@ namespace BizHawk.Emulation.Cores.Arcades.MAME
 			string inputFields = MameGetString(MAMELuaCommand.GetInputFields);
 			string[] portFields = inputFields.Split(';');
 			MAMEController.BoolButtons.Clear();
+			_fieldsPorts.Clear();
 
 			foreach (string portField in portFields)
 			{