From ad848c5e9653bbc6815bd422c0ec674e995a09e9 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Fri, 15 Nov 2013 16:52:29 +0000
Subject: [PATCH] Fix bug in MovieHeader that throws an exception in the Play
 Movie dialog if a movie with Board Properties is loaded (this is just a work
 around to a problem caused by a bad design!)

---
 BizHawk.Client.Common/movie/MovieHeader.cs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/BizHawk.Client.Common/movie/MovieHeader.cs b/BizHawk.Client.Common/movie/MovieHeader.cs
index 556cecf241..5818822ee9 100644
--- a/BizHawk.Client.Common/movie/MovieHeader.cs
+++ b/BizHawk.Client.Common/movie/MovieHeader.cs
@@ -78,6 +78,15 @@ namespace BizHawk.Client.Common
 				HeaderParams.Add(key, value);
 		}
 
+		public void AddBoardProperty(string key, string value)
+		{
+			string temp;
+			if (!BoardProperties.TryGetValue(key, out temp))
+			{
+				BoardProperties.Add(key, value);
+			}
+		}
+
 		public void UpdateRerecordCount(int count)
 		{
 			HeaderParams[RERECORDS] = count.ToString();
@@ -232,7 +241,7 @@ namespace BizHawk.Client.Common
 			{
 				line = ParseHeader(line, BOARDPROPERTIES);
 				string[] vals = line.Split(' ');
-				BoardProperties.Add(vals[0], vals[1]);
+				AddBoardProperty(vals[0], vals[1]);
 			}
 			else if (line.StartsWith("subtitle") || line.StartsWith("sub"))
 			{