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

Tastudio - fix regression where default.tasproj is loaded if the file exists, fixes #1937

This commit is contained in:
adelikat 2020-04-24 17:07:32 -05:00
parent d06ddc04e1
commit 49395b435f
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
View File

@ -699,7 +699,7 @@ namespace BizHawk.Client.EmuHawk
SetTasMovieCallbacks(tasMovie); SetTasMovieCallbacks(tasMovie);
tasMovie.ClearChanges(); // Don't ask to save changes here. tasMovie.ClearChanges(); // Don't ask to save changes here.
if (HandleMovieLoadStuff(tasMovie)) if (HandleMovieLoadStuff(tasMovie, false))
{ {
CurrentTasMovie.TasStateManager.Capture(); // Capture frame 0 always. CurrentTasMovie.TasStateManager.Capture(); // Capture frame 0 always.
} }
@ -717,14 +717,23 @@ namespace BizHawk.Client.EmuHawk
TasView.Refresh(); TasView.Refresh();
} }
private bool HandleMovieLoadStuff(ITasMovie movie) private bool HandleMovieLoadStuff(ITasMovie movie, bool loadMovie = true)
{ {
WantsToControlStopMovie = false; WantsToControlStopMovie = false;
var result = StartNewMovieWrapper(movie);
if (!result) if (loadMovie)
{ {
return false; var result = StartNewMovieWrapper(movie);
if (!result)
{
return false;
}
}
else
{
MovieSession.QueueNewMovie(movie, true, Emulator.SystemId);
MovieSession.RunQueuedMovie(true, Emulator);
} }
WantsToControlStopMovie = true; WantsToControlStopMovie = true;