From 42ba391c4fcf633fbe85d7b2f48f0d5abaee2844 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Mon, 25 Mar 2013 00:20:07 +0000
Subject: [PATCH] Oops, fix my last commit

---
 BizHawk.MultiClient/PlayMovie.cs         | 2 +-
 BizHawk.MultiClient/RecordMovie.cs       | 2 +-
 BizHawk.MultiClient/movie/MovieHeader.cs | 9 ++++++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/BizHawk.MultiClient/PlayMovie.cs b/BizHawk.MultiClient/PlayMovie.cs
index 067f127131..7454ceeb58 100644
--- a/BizHawk.MultiClient/PlayMovie.cs
+++ b/BizHawk.MultiClient/PlayMovie.cs
@@ -395,7 +395,7 @@ namespace BizHawk.MultiClient
 						}
 						break;
 					case MovieHeader.EMULATIONVERSION:
-						if (kvp.Value.ToString() != MainForm.EMUVERSION)
+						if (kvp.Value.ToString() != Global.MainForm.GetEmuVersion())
 						{
 							item.BackColor = Color.Yellow;
 						}
diff --git a/BizHawk.MultiClient/RecordMovie.cs b/BizHawk.MultiClient/RecordMovie.cs
index 39c7a3d631..e8f1591592 100644
--- a/BizHawk.MultiClient/RecordMovie.cs
+++ b/BizHawk.MultiClient/RecordMovie.cs
@@ -67,7 +67,7 @@ namespace BizHawk.MultiClient
 
 				//Header
 				MovieToRecord.Header.SetHeaderLine(MovieHeader.AUTHOR, AuthorBox.Text);
-				MovieToRecord.Header.SetHeaderLine(MovieHeader.EMULATIONVERSION, MainForm.EMUVERSION);
+				MovieToRecord.Header.SetHeaderLine(MovieHeader.EMULATIONVERSION, Global.MainForm.GetEmuVersion());
 				MovieToRecord.Header.SetHeaderLine(MovieHeader.MOVIEVERSION, MovieHeader.MovieVersion);
 				MovieToRecord.Header.SetHeaderLine(MovieHeader.GUID, MovieHeader.MakeGUID());
 				MovieToRecord.Header.SetHeaderLine(MovieHeader.PLATFORM, Global.Game.System);
diff --git a/BizHawk.MultiClient/movie/MovieHeader.cs b/BizHawk.MultiClient/movie/MovieHeader.cs
index b897fb80ec..6e6a7023de 100644
--- a/BizHawk.MultiClient/movie/MovieHeader.cs
+++ b/BizHawk.MultiClient/movie/MovieHeader.cs
@@ -48,7 +48,14 @@ namespace BizHawk.MultiClient
 
 		public MovieHeader() //All required fields will be set to default values
 		{
-			HeaderParams.Add(EMULATIONVERSION, Global.MainForm.GetEmuVersion());
+			if (Global.MainForm != null)
+			{
+				HeaderParams.Add(EMULATIONVERSION, Global.MainForm.GetEmuVersion());
+			}
+			else
+			{
+				HeaderParams.Add(EMULATIONVERSION, MainForm.EMUVERSION);
+			}
 			HeaderParams.Add(MOVIEVERSION, MovieVersion);
 			HeaderParams.Add(PLATFORM, "");
 			HeaderParams.Add(GAMENAME, "");