handle user input vs MovieMode.FINISHED better
This commit is contained in:
parent
503ecac44c
commit
63e4eaef79
|
@ -1440,13 +1440,7 @@ namespace BizHawk.MultiClient
|
||||||
|
|
||||||
MovieSession session = Global.MovieSession;
|
MovieSession session = Global.MovieSession;
|
||||||
|
|
||||||
if (UserMovie.Mode == MOVIEMODE.FINISHED)
|
if (UserMovie.Mode == MOVIEMODE.RECORD || UserMovie.Mode == MOVIEMODE.PLAY)
|
||||||
{
|
|
||||||
//todo - a better way of ending
|
|
||||||
StopMovie();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (UserMovie.Mode != MOVIEMODE.INACTIVE)
|
|
||||||
{
|
{
|
||||||
session.LatchInputFromLog();
|
session.LatchInputFromLog();
|
||||||
}
|
}
|
||||||
|
@ -1464,7 +1458,7 @@ namespace BizHawk.MultiClient
|
||||||
session.Movie.CommitFrame(Global.Emulator.Frame, Global.MovieInputSourceAdapter);
|
session.Movie.CommitFrame(Global.Emulator.Frame, Global.MovieInputSourceAdapter);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (UserMovie.Mode == MOVIEMODE.INACTIVE)
|
if (UserMovie.Mode == MOVIEMODE.INACTIVE || UserMovie.Mode == MOVIEMODE.FINISHED)
|
||||||
{
|
{
|
||||||
session.LatchInputFromPlayer(Global.MovieInputSourceAdapter);
|
session.LatchInputFromPlayer(Global.MovieInputSourceAdapter);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue