From 4b4e6d99500aa19e156b493801b57615adbccee1 Mon Sep 17 00:00:00 2001 From: "andres.delikat" Date: Sat, 24 Sep 2011 17:25:19 +0000 Subject: [PATCH] Movies - partial fix to movie loadstate logic for movie finished mode. Movie savestates will now behave properly. The user can break things by making a savestate during movie finished mode and trying to load that. Will have to rethink and implement some things to work around this. --- BizHawk.MultiClient/MainForm.Movie.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/BizHawk.MultiClient/MainForm.Movie.cs b/BizHawk.MultiClient/MainForm.Movie.cs index 5c1363b9cd..01acef0be0 100644 --- a/BizHawk.MultiClient/MainForm.Movie.cs +++ b/BizHawk.MultiClient/MainForm.Movie.cs @@ -166,13 +166,13 @@ namespace BizHawk.MultiClient { if (ReadOnly) { - if (Global.Emulator.Frame > Global.MovieSession.Movie.Length()) - { + //if (Global.Emulator.Frame > Global.MovieSession.Movie.Length()) + //{ //Post movie savestate //There is no movie data to load, and the movie will stay in movie finished mode //So do nothing - } - else + //} + //else { if (!Global.MovieSession.Movie.CheckTimeLines(path, false)) return false; //Timeline/GUID error @@ -182,13 +182,13 @@ namespace BizHawk.MultiClient } else { - if (Global.Emulator.Frame > Global.MovieSession.Movie.Length()) - { + //if (Global.Emulator.Frame > Global.MovieSession.Movie.Length()) //TODO: we haven't changed the emulator frame so this doesn't make sense! + //{ //Post movie savestate //There is no movie data to load, and the movie will stay in movie finished mode //So do nothing - } - else + //} + //else { if (!Global.MovieSession.Movie.CheckTimeLines(path, true)) return false; //GUID Error