From 9928a88d2cbd54047d1e4a6d01ce36e0e7e06d25 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Fri, 17 Apr 2020 15:49:41 -0500
Subject: [PATCH] simplify movieSession core preference shenanigans

---
 BizHawk.Client.Common/movie/MovieSession.cs | 28 ++++++++-------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/BizHawk.Client.Common/movie/MovieSession.cs b/BizHawk.Client.Common/movie/MovieSession.cs
index dbc25c9550..1951b284f1 100644
--- a/BizHawk.Client.Common/movie/MovieSession.cs
+++ b/BizHawk.Client.Common/movie/MovieSession.cs
@@ -251,25 +251,17 @@ namespace BizHawk.Client.Common
 
 			if (!record)
 			{
-				switch (emulator.SystemId)
+				var preference = emulator.SystemId;
+				if (preference == "GBC")
 				{
-					case "NES":
-						PreferredCores["NES"] = Global.Config.PreferredCores["NES"];
-						Global.Config.PreferredCores["NES"] = movie.Core;
-						break;
-					case "SNES":
-						PreferredCores["SNES"] = Global.Config.PreferredCores["SNES"];
-						Global.Config.PreferredCores["SNES"] = movie.Core;
-						break;
-					case "GBA":
-						PreferredCores["GBA"] = Global.Config.PreferredCores["GBA"];
-						Global.Config.PreferredCores["GBA"] = movie.Core;
-						break;
-					case "GB":
-					case "GBC":
-						PreferredCores["GB"] = Global.Config.PreferredCores["GB"];
-						Global.Config.PreferredCores["GB"] = movie.Core;
-						break;
+					// We want to treat GBC the same as GB
+					preference = "GB";
+				}
+
+				if (Global.Config.PreferredCores.ContainsKey(preference))
+				{
+					PreferredCores[preference] = Global.Config.PreferredCores[preference];
+					Global.Config.PreferredCores[preference] = movie.Core;
 				}
 			}