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

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

This reverts commit 49395b435f.
This commit is contained in:
adelikat 2020-04-24 18:47:49 -05:00
parent fb443f262c
commit 7484fc1ad2
1 changed files with 5 additions and 14 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);
tasMovie.ClearChanges(); // Don't ask to save changes here.
if (HandleMovieLoadStuff(tasMovie, false))
if (HandleMovieLoadStuff(tasMovie))
{
CurrentTasMovie.TasStateManager.Capture(); // Capture frame 0 always.
}
@ -717,23 +717,14 @@ namespace BizHawk.Client.EmuHawk
TasView.Refresh();
}
private bool HandleMovieLoadStuff(ITasMovie movie, bool loadMovie = true)
private bool HandleMovieLoadStuff(ITasMovie movie)
{
WantsToControlStopMovie = false;
var result = StartNewMovieWrapper(movie);
if (loadMovie)
if (!result)
{
var result = StartNewMovieWrapper(movie);
if (!result)
{
return false;
}
}
else
{
MovieSession.QueueNewMovie(movie, true, Emulator.SystemId);
MovieSession.RunQueuedMovie(true, Emulator);
return false;
}
WantsToControlStopMovie = true;