From ec58c2d34c9b3e07023885481b7c376da5783ed7 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Mon, 8 Dec 2014 19:07:36 +0000
Subject: [PATCH] Don't load missing or empty Sync Settings when loading a
 movie, just keep the user's current settings rather than forcing default
 settings on them

---
 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 6dc85b7b4a..3eb348d845 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -1946,7 +1946,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private void CoreSyncSettings(object sender, RomLoader.SettingsLoadArgs e)
 		{
-			if (Global.MovieSession.QueuedMovie != null)
+			if (Global.MovieSession.QueuedMovie != null && !string.IsNullOrWhiteSpace(Global.MovieSession.QueuedMovie.SyncSettingsJson))
 			{
 				e.Settings = ConfigService.LoadWithType(Global.MovieSession.QueuedMovie.SyncSettingsJson);
 			}