Only go to Movie 'Finished' mode if Tastudio is not engaged. Make sure Movie log and savestates are updated correctly so that tastudio still works correctly when you play through the end of the movie in read-only mode.

This commit is contained in:
phillip.grimsrud 2012-11-01 03:53:12 +00:00
parent 6e214a6059
commit 98d86ec995
1 changed files with 14 additions and 1 deletions

View File

@ -253,12 +253,25 @@ namespace BizHawk.MultiClient
{
if (Global.Emulator.Frame >= Global.MovieSession.Movie.Frames)
{
Global.MovieSession.Movie.Finish();
if (TAStudio1.IsHandleCreated && !TAStudio1.IsDisposed)
{
Global.MovieSession.Movie.CaptureState();
Global.MovieSession.LatchInputFromLog();
Global.MovieSession.Movie.CommitFrame(Global.Emulator.Frame, Global.MovieOutputHardpoint);
}
else
{
Global.MovieSession.Movie.Finish();
}
}
else
{
Global.MovieSession.Movie.CaptureState();
Global.MovieSession.LatchInputFromLog();
if (TAStudio1.IsHandleCreated && !TAStudio1.IsDisposed)
{
Global.MovieSession.Movie.CommitFrame(Global.Emulator.Frame, Global.MovieOutputHardpoint);
}
}
}