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

simplify TAStudio movie starting 

- removes HandleMovieLoadStuff, which should ™️ not be necessary
- pass newMovie parameter into MainForm.StartNewMovie. This is currently probably irrelevant, but useful later
This commit is contained in:
Morilli 2024-08-21 22:24:39 +02:00
parent 1c44dc5913
commit b6a0688be0
2 changed files with 6 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IControlMainForm.cs
View File

@ -107,7 +107,7 @@
{
if (!AskSaveChanges()) return false;
WantsToControlStopMovie = false;
var success = StartNewMovieWrapper(CurrentTasMovie);
var success = StartNewMovieWrapper(CurrentTasMovie, false);
WantsToControlStopMovie = true;
RefreshDialog();
return success;

32
src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
View File

@ -250,7 +250,7 @@ namespace BizHawk.Client.EmuHawk
}
ConvertCurrentMovieToTasproj();
StartNewMovieWrapper(CurrentTasMovie);
StartNewMovieWrapper(CurrentTasMovie, false);
SetUpColumns();
}
@ -527,7 +527,7 @@ namespace BizHawk.Client.EmuHawk
tasMovie.BindMarkersToInput = Settings.BindMarkersToInput;
tasMovie.GreenzoneInvalidated = GreenzoneInvalidated;
if (!HandleMovieLoadStuff(tasMovie))
if (!StartNewMovieWrapper(tasMovie, false))
{
return false;
}
@ -582,7 +582,6 @@ namespace BizHawk.Client.EmuHawk
var tasMovie = (ITasMovie)MovieSession.Get(filename);
tasMovie.BindMarkersToInput = Settings.BindMarkersToInput;
tasMovie.GreenzoneInvalidated = GreenzoneInvalidated;
tasMovie.PropertyChanged += TasMovie_OnPropertyChanged;
@ -593,9 +592,8 @@ namespace BizHawk.Client.EmuHawk
MainForm.FirmwareManager,
Config.DefaultAuthor);
SetTasMovieCallbacks(tasMovie);
tasMovie.ClearChanges();
_ = HandleMovieLoadStuff(tasMovie);
StartNewMovieWrapper(tasMovie, true);
// clear all selections
TasView.DeselectAll();
@ -606,34 +604,14 @@ namespace BizHawk.Client.EmuHawk
TasView.Refresh();
}
private bool HandleMovieLoadStuff(ITasMovie movie)
{
WantsToControlStopMovie = false;
var result = StartNewMovieWrapper(movie);
if (!result)
{
return false;
}
WantsToControlStopMovie = true;
CurrentTasMovie.ChangeLog.Clear();
UpdateWindowTitle();
MessageStatusLabel.Text = $"{Path.GetFileName(CurrentTasMovie.Filename)} loaded.";
return true;
}
private bool StartNewMovieWrapper(ITasMovie movie)
private bool StartNewMovieWrapper(ITasMovie movie, bool isNew)
{
_initializing = true;
SetTasMovieCallbacks(movie);
SuspendLayout();
bool result = MainForm.StartNewMovie(movie, false);
bool result = MainForm.StartNewMovie(movie, isNew);
ResumeLayout();
if (result)
{