ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

respect the Movie end type when loading .tasproj files outside of tastudio

This commit is contained in:
adelikat 2020-07-11 18:52:52 -05:00
parent 1f39160999
commit 8900618ce1
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/BizHawk.Client.Common/movie/MovieSession.cs
View File

@ -94,6 +94,7 @@ namespace BizHawk.Client.Common
} }
} }
// TODO: this is a mess, simplify
public void HandleFrameAfter() public void HandleFrameAfter()
{ {
if (Movie is ITasMovie tasMovie) if (Movie is ITasMovie tasMovie)
@ -101,7 +102,14 @@ namespace BizHawk.Client.Common
tasMovie.GreenzoneCurrentFrame(); tasMovie.GreenzoneCurrentFrame();
if (tasMovie.IsPlayingOrFinished() && Movie.Emulator.Frame >= tasMovie.InputLogLength) if (tasMovie.IsPlayingOrFinished() && Movie.Emulator.Frame >= tasMovie.InputLogLength)
{ {
HandleFrameLoopForRecordMode(); if (Settings.MovieEndAction == MovieEndAction.Record)
{
HandleFrameLoopForRecordMode();
}
else
{
HandlePlaybackEnd();
}
} }
} }
else if (Movie.IsPlaying() && Movie.Emulator.Frame >= Movie.InputLogLength) else if (Movie.IsPlaying() && Movie.Emulator.Frame >= Movie.InputLogLength)