From 707c0944f053b85d234c145780011b724a9c41d1 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Thu, 22 Sep 2016 10:13:26 -0400
Subject: [PATCH] clear the OSD before doing loadstate callbacks, fixes #635

---
 BizHawk.Client.EmuHawk/MainForm.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index db7a1010c1..018be37bc0 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -3729,6 +3729,7 @@ namespace BizHawk.Client.EmuHawk
 
 			if (SavestateManager.LoadStateFile(path, userFriendlyStateName))
 			{
+				GlobalWin.OSD.ClearGUIText();
 				ClientApi.OnStateLoaded(this, userFriendlyStateName);
 
 				if (GlobalWin.Tools.Has<LuaConsole>())
@@ -3737,7 +3738,6 @@ namespace BizHawk.Client.EmuHawk
 				}
 
 				SetMainformMovieInfo();
-				GlobalWin.OSD.ClearGUIText();
 				GlobalWin.Tools.UpdateToolsBefore(fromLua);
 				UpdateToolsAfter(fromLua);
 				UpdateToolsLoadstate();