From 7a6e28e2b2b54e6641b44b5d8b85c9bf07f0256f Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Tue, 10 Jun 2014 01:10:54 +0000
Subject: [PATCH] Fix the play movie dialog, this is a weird threading caused
 bug and my fix isn't good, but it fixes it

---
 BizHawk.Client.EmuHawk/movie/PlayMovie.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/BizHawk.Client.EmuHawk/movie/PlayMovie.cs b/BizHawk.Client.EmuHawk/movie/PlayMovie.cs
index 295573cf61..7926bfa2a2 100644
--- a/BizHawk.Client.EmuHawk/movie/PlayMovie.cs
+++ b/BizHawk.Client.EmuHawk/movie/PlayMovie.cs
@@ -111,7 +111,12 @@ namespace BizHawk.Client.EmuHawk
 				{
 					//System.Diagnostics.Stopwatch watch = new System.Diagnostics.Stopwatch(); watch.Start();
 					var movie = PreLoadMovieFile(file, force);
+					if (movie == null)
+					{
+						return null;
+					}
 					//watch.Stop(); Console.WriteLine("[{0}] {1}",watch.ElapsedMilliseconds,Path.GetFileName(filename));
+					
 					lock (_movieList)
 					{
 						_movieList.Add(movie);