From 681b3b570d47f2fe0e2f493acc6c517f0bd86b27 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sat, 27 Sep 2014 15:01:39 +0000
Subject: [PATCH] Movie autoload - don't crash if movie file couldn't be found,
 fix logic that opens the Open Rom dialog if Autoload rom is not picked, fixes
 issue 272

---
 BizHawk.Client.EmuHawk/MainForm.cs | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index 2f4664e6b3..35e3f6477f 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -306,13 +306,23 @@ namespace BizHawk.Client.EmuHawk
 			}
 			else if (Global.Config.RecentMovies.AutoLoad && !Global.Config.RecentMovies.Empty)
 			{
-				if (Global.Game == null)
+				if (Global.Game.IsNullInstance)
 				{
 					OpenRom();
 				}
-				else
+
+				// If user picked a game, then do the autoload logic
+				if (!Global.Game.IsNullInstance)
 				{
-					StartNewMovie(MovieService.Get(Global.Config.RecentMovies.MostRecent), false);
+
+					if (File.Exists(Global.Config.RecentMovies.MostRecent))
+					{
+						StartNewMovie(MovieService.Get(Global.Config.RecentMovies.MostRecent), false);
+					}
+					else
+					{
+						Global.Config.RecentMovies.HandleLoadError(Global.Config.RecentMovies.MostRecent);
+					}
 				}
 			}