Refix rewinding in movie finished mode. It now properly restores the movie to playback mode.
This commit is contained in:
parent
63e4eaef79
commit
ac032d1b92
|
@ -1471,22 +1471,22 @@ namespace BizHawk.MultiClient
|
|||
Global.MovieMode = false;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
//TODO ZERO - I DONT LIKE THIS. INSPECT IT LATER.
|
||||
|
||||
//if (UserMovie.Mode == MOVIEMODE.FINISHED)
|
||||
//{
|
||||
// if (UserMovie.Length() > Global.Emulator.Frame)
|
||||
// {
|
||||
// UserMovie.StartPlayback();
|
||||
// Global.MovieSession.MovieControllerAdapter.SetControllersAsMnemonic(UserMovie.GetInputFrame(Global.Emulator.Frame));
|
||||
// }
|
||||
//}
|
||||
if (UserMovie.Mode == MOVIEMODE.FINISHED)
|
||||
{
|
||||
if (UserMovie.Length() > Global.Emulator.Frame)
|
||||
{
|
||||
UserMovie.StartPlayback();
|
||||
//Global.MovieSession.MovieControllerAdapter.SetControllersAsMnemonic(UserMovie.GetInputFrame(Global.Emulator.Frame));
|
||||
//Global.MovieMode = true;
|
||||
//adelikat: is Global.MovieMode doing anything anymore? if not we shoudl remove this variable
|
||||
session.LatchInputFromLog();
|
||||
}
|
||||
}
|
||||
|
||||
//TODO: adelikat: don't know what this should do so leaving it commented out
|
||||
//if (UserMovie.Mode == MOVIEMODE.RECORD && Global.MovieSession.MultiTrack.IsActive)
|
||||
//{
|
||||
// Global.MovieSession.MovieControllerAdapter.SetControllersAsMnemonic(UserMovie.GetInputFrame(Global.Emulator.Frame-1));
|
||||
// Console.WriteLine("Out: " + UserMovie.GetInputFrame(Global.Emulator.Frame));
|
||||
// Global.MovieSession.MovieControllerAdapter.SetControllersAsMnemonic(UserMovie.GetInputFrame(Global.Emulator.Frame-1));
|
||||
//}
|
||||
|
||||
//=======================================
|
||||
|
|
Loading…
Reference in New Issue