Fix bug where movie was failing to go into finished mode and would crash instead, fixes issue #429
This commit is contained in:
parent
9a02a5cac0
commit
55b4991d8e
|
@ -136,9 +136,16 @@ namespace BizHawk.Client.Common
|
||||||
{
|
{
|
||||||
var input = Movie.GetInputState(Global.Emulator.Frame);
|
var input = Movie.GetInputState(Global.Emulator.Frame);
|
||||||
|
|
||||||
|
// adelikat: TODO: this is likely the source of frame 0 TAStudio bugs, I think the intent is to check if the movie is 0 length?
|
||||||
if (Global.Emulator.Frame == 0) // Hacky
|
if (Global.Emulator.Frame == 0) // Hacky
|
||||||
HandleMovieAfterFrameLoop(); // Frame 0 needs to be handled.
|
HandleMovieAfterFrameLoop(); // Frame 0 needs to be handled.
|
||||||
|
|
||||||
|
if (input == null)
|
||||||
|
{
|
||||||
|
HandleMovieAfterFrameLoop();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
MovieControllerAdapter.LatchFromSource(input);
|
MovieControllerAdapter.LatchFromSource(input);
|
||||||
if (MultiTrack.IsActive)
|
if (MultiTrack.IsActive)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue