From 2f51331ca831ca9c21c1662aa9c8524f8c92e7f8 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sun, 9 Nov 2014 15:48:06 +0000
Subject: [PATCH] Fix a nasty bug in movie loadstate behavior

---
 BizHawk.Client.Common/SavestateManager.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/BizHawk.Client.Common/SavestateManager.cs b/BizHawk.Client.Common/SavestateManager.cs
index 5fbefb1bd3..73c896732f 100644
--- a/BizHawk.Client.Common/SavestateManager.cs
+++ b/BizHawk.Client.Common/SavestateManager.cs
@@ -86,6 +86,11 @@ namespace BizHawk.Client.Common
 					if (Global.MovieSession.Movie.IsActive)
 					{
 						bl.GetLump(BinaryStateLump.Input, true, tr => succeed = Global.MovieSession.HandleMovieLoadState_HackyStep1(tr));
+						if (!succeed)
+						{
+							return false;
+						}
+
 						bl.GetLump(BinaryStateLump.Input, true, tr => succeed = Global.MovieSession.HandleMovieLoadState_HackyStep2(tr));
 						if (!succeed)
 						{