From c88a6b4b7a1645b9c0f2b5d3b08e6dfc29de6d2c Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Wed, 28 Mar 2012 01:03:50 +0000
Subject: [PATCH] Lua - savestate.registersave/load - pass state name as a
 string (ex:"quicksave0").  Put event after the save/load not before.  Event
 no longer fires on non-saveslot events

---
 BizHawk.MultiClient/LuaImplementation.cs | 6 +++---
 BizHawk.MultiClient/MainForm.cs          | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/BizHawk.MultiClient/LuaImplementation.cs b/BizHawk.MultiClient/LuaImplementation.cs
index 70cbc32359..f5e634b1d6 100644
--- a/BizHawk.MultiClient/LuaImplementation.cs
+++ b/BizHawk.MultiClient/LuaImplementation.cs
@@ -25,13 +25,13 @@ namespace BizHawk.MultiClient
 		LuaFunction savestate_registersavefunc;
 		LuaFunction savestate_registerloadfunc;
 		
-		public void SavestateRegisterSave()
+		public void SavestateRegisterSave(string name)
 		{
 			if (savestate_registersavefunc != null)
 			{
 				try
 				{
-					savestate_registersavefunc.Call();
+					savestate_registersavefunc.Call(name);
 				}
 				catch (SystemException e)
 				{
@@ -41,7 +41,7 @@ namespace BizHawk.MultiClient
 			}
 		}
 
-		public void SavestateRegisterLoad()
+		public void SavestateRegisterLoad(string name)
 		{
 			if (savestate_registerloadfunc != null)
 			{
diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs
index 1b40635c3b..c60de50ac2 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -1888,11 +1888,11 @@ namespace BizHawk.MultiClient
 
 			var writer = new StreamWriter(path);
 			SaveStateFile(writer, name, false);
+			LuaConsole1.LuaImp.SavestateRegisterSave(name);
 		}
 
 		public void SaveStateFile(StreamWriter writer, string name, bool fromLua)
 		{
-			LuaConsole1.LuaImp.SavestateRegisterSave();
 			Global.Emulator.SaveStateText(writer);
 			HandleMovieSaveState(writer);
 			if (Global.Config.SaveScreenshotWithStates)
@@ -1938,7 +1938,6 @@ namespace BizHawk.MultiClient
 
 		public void LoadStateFile(string path, string name)
 		{
-			LuaConsole1.LuaImp.SavestateRegisterLoad();
 			if (HandleMovieLoadState(path))
 			{
 				var reader = new StreamReader(path);
@@ -1970,6 +1969,7 @@ namespace BizHawk.MultiClient
 				return;
 
 			LoadStateFile(path, name);
+			LuaConsole1.LuaImp.SavestateRegisterLoad(name);
 		}
 
 		private void LoadStateAs()