From c41851e8770e92c09d947e5ae6afe79e7b212fbe Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Mon, 15 Feb 2016 19:17:19 -0500
Subject: [PATCH] Call the lua loadstate callback before redrawing the screen
 and other updates

---
 BizHawk.Client.EmuHawk/MainForm.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index 7644e6a83d..70a5921c86 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -3692,6 +3692,11 @@ namespace BizHawk.Client.EmuHawk
 
 			if (SavestateManager.LoadStateFile(path, userFriendlyStateName))
 			{
+				if (GlobalWin.Tools.Has<LuaConsole>())
+				{
+					GlobalWin.Tools.LuaConsole.LuaImp.CallLoadStateEvent(userFriendlyStateName);
+				}
+
 				SetMainformMovieInfo();
 				GlobalWin.OSD.ClearGUIText();
 				GlobalWin.Tools.UpdateToolsBefore(fromLua);
@@ -3703,11 +3708,6 @@ namespace BizHawk.Client.EmuHawk
 				{
 					GlobalWin.OSD.AddMessage("Loaded state: " + userFriendlyStateName);
 				}
-
-				if (GlobalWin.Tools.Has<LuaConsole>())
-				{
-					GlobalWin.Tools.LuaConsole.LuaImp.CallLoadStateEvent(userFriendlyStateName);
-				}
 			}
 			else
 			{