From 34fd1ec10a43001bc6709251598d16e69d2a40f4 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Fri, 10 Jan 2014 02:01:57 +0000
Subject: [PATCH] Movies 2.0 - fix some stuff

---
 .../movie/ControllerLookups/MnemonicGenerators.cs      |  6 +++++-
 .../movie/ControllerLookups/NesMnemonicGenerator.cs    | 10 +++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/BizHawk.Client.Common/movie/ControllerLookups/MnemonicGenerators.cs b/BizHawk.Client.Common/movie/ControllerLookups/MnemonicGenerators.cs
index d1ab8f583a..591b7e3f51 100644
--- a/BizHawk.Client.Common/movie/ControllerLookups/MnemonicGenerators.cs
+++ b/BizHawk.Client.Common/movie/ControllerLookups/MnemonicGenerators.cs
@@ -93,6 +93,10 @@ namespace BizHawk.Client.Common
 		public BooleanControllerMnemonicGenerator(string name, IDictionary<string, char> mnemonics)
 		{
 			_controllerMnemonics = new NamedDictionary<string, char>(name);
+			foreach (var kvp in mnemonics)
+			{
+				_controllerMnemonics.Add(kvp.Key, kvp.Value);
+			}
 		}
 
 		public void Add(string key, char value)
@@ -104,7 +108,7 @@ namespace BizHawk.Client.Common
 		{
 			get
 			{
-				return _controllerMnemonics.ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
+				return _controllerMnemonics.ToDictionary(kvp => ControllerPrefix + " " + kvp.Key, kvp => kvp.Value);
 			}
 		}
 
diff --git a/BizHawk.Client.Common/movie/ControllerLookups/NesMnemonicGenerator.cs b/BizHawk.Client.Common/movie/ControllerLookups/NesMnemonicGenerator.cs
index 773329468e..75c231b22a 100644
--- a/BizHawk.Client.Common/movie/ControllerLookups/NesMnemonicGenerator.cs
+++ b/BizHawk.Client.Common/movie/ControllerLookups/NesMnemonicGenerator.cs
@@ -160,16 +160,16 @@ namespace BizHawk.Client.Common
 		{
 			get
 			{
-				var kvps = new List<KeyValuePair<string, char>>();
-				foreach (var blah in AvailableGenerators)
+				var dictionary = new Dictionary<string, char>();
+				foreach (var generator in AvailableGenerators)
 				{
-					foreach (var blah2 in blah.AvailableMnemonics)
+					foreach (var mnemonic in generator.AvailableMnemonics)
 					{
-						kvps.Add(blah2);
+						dictionary.Add(mnemonic.Key, mnemonic.Value);
 					}
 				}
 
-				return kvps.ToDictionary(x => x.Key, x => x.Value);
+				return dictionary;
 			}
 		}
 		#endregion