From 8ed0265c9d20f2cccaa2b5d67ccf5537ba0fe70c Mon Sep 17 00:00:00 2001
From: goyuken <goyuken@4bbf4f03-6f44-549e-7e59-35d4b0962838>
Date: Wed, 1 Jan 2014 21:24:58 +0000
Subject: [PATCH] remove a bit of hackish stuff in the new RomLoader by
 offloading mainform-appropriate work back to mainform

---
 BizHawk.Client.Common/RomLoader.cs | 29 +----------------------------
 BizHawk.Client.EmuHawk/MainForm.cs | 13 ++++++++++---
 2 files changed, 11 insertions(+), 31 deletions(-)

diff --git a/BizHawk.Client.Common/RomLoader.cs b/BizHawk.Client.Common/RomLoader.cs
index e35a88d466..57348573ba 100644
--- a/BizHawk.Client.Common/RomLoader.cs
+++ b/BizHawk.Client.Common/RomLoader.cs
@@ -58,7 +58,6 @@ namespace BizHawk.Client.Common
 
 		// TODO: reconsider the need for exposing these;
 		public IEmulator LoadedEmulator { get; private set; }
-		public CoreComm NextComm { get; private set; }
 		public GameInfo Game { get; private set; }
 		public RomGame Rom { get; private set; }
 		public string CanonicalFullPath { get; private set; }
@@ -98,8 +97,6 @@ namespace BizHawk.Client.Common
 
 		public Func<HawkFile, int?> ChooseArchive { get; set; }
 
-		public Action<string> CoreCommMessageCallback { get; set; } // TODO: eww, do we have to do this?
-
 		private int? HandleArchive(HawkFile file)
 		{
 			if (ChooseArchive != null)
@@ -118,22 +115,7 @@ namespace BizHawk.Client.Common
 			}
 		}
 
-		// TODO I'm in mainform.cs and here, move me to a common place that both can call, static method on the config object?
-		private static void CommitCoreSettingsToConfig()
-		{
-			// save settings object
-			var t = Global.Emulator.GetType();
-			Global.Config.PutCoreSettings(Global.Emulator.GetSettings(), t);
-			
-			// don't trample config with loaded-from-movie settings
-			if (!Global.MovieSession.Movie.IsActive)
-			{
-				Global.Config.PutCoreSyncSettings(Global.Emulator.GetSyncSettings(), t);
-			}
-		}
-
-		// TODO: the hasMovie hack should be obsoleted by the standardized movie sync setting saving/loading
-		public bool LoadRom(string path, bool hasmovie = false)
+		public bool LoadRom(string path, CoreComm nextComm)
 		{
 			if (path == null)
 			{
@@ -177,13 +159,6 @@ namespace BizHawk.Client.Common
 				IEmulator nextEmulator = null;
 				RomGame rom = null;
 				GameInfo game = null;
-				var nextComm = new CoreComm(CoreCommMessageCallback);
-				CoreFileProvider.SyncCoreCommInputSignals(nextComm);
-
-				// this also happens in CloseGame().  but it needs to happen here since if we're restarting with the same core,
-				// any settings changes that we made need to make it back to config before we try to instantiate that core with
-				// the new settings objects
-				CommitCoreSettingsToConfig();
 
 				try
 				{
@@ -438,7 +413,6 @@ namespace BizHawk.Client.Common
 
 								break;
 							case "N64":
-								Global.Game = game;
 								nextEmulator = new N64(nextComm, game, rom.RomData, GetCoreSyncSettings<N64>());
 								break;
 							case "DEBUG":
@@ -465,7 +439,6 @@ namespace BizHawk.Client.Common
 
 				Rom = rom;
 				LoadedEmulator = nextEmulator;
-				NextComm = nextComm;
 				Game = game;
 				CanonicalFullPath = file.CanonicalFullPath;
 				return true;
diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index 53658657ce..d852834c8a 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -2948,7 +2948,6 @@ namespace BizHawk.Client.EmuHawk
 			var loader = new RomLoader
 				{
 					ChooseArchive = LoadArhiveChooser,
-					CoreCommMessageCallback = ShowMessageCoreComm
 				};
 
 			loader.OnLoadError += ShowLoadError;
@@ -2956,7 +2955,15 @@ namespace BizHawk.Client.EmuHawk
 			loader.OnLoadSettings += CoreSettings;
 			loader.OnLoadSyncSettings += CoreSyncSettings;
 
-			var result = loader.LoadRom(path, hasmovie);
+			// this also happens in CloseGame().  but it needs to happen here since if we're restarting with the same core,
+			// any settings changes that we made need to make it back to config before we try to instantiate that core with
+			// the new settings objects
+			CommitCoreSettingsToConfig();
+
+			var nextComm = new CoreComm(ShowMessageCoreComm);
+			CoreFileProvider.SyncCoreCommInputSignals(nextComm);
+
+			var result = loader.LoadRom(path, nextComm);
 
 			if (result)
 			{
@@ -2971,7 +2978,7 @@ namespace BizHawk.Client.EmuHawk
 				CloseGame();
 				Global.Emulator.Dispose();
 				Global.Emulator = loader.LoadedEmulator;
-				Global.CoreComm = loader.NextComm;
+				Global.CoreComm = nextComm;
 				Global.Game = loader.Game;
 				CoreFileProvider.SyncCoreCommInputSignals();
 				InputManager.SyncControls();