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

Tastudio - various fixes to restart and initializing logic, still some flaws but makes things less catastrophic

This commit is contained in:
adelikat 2014-10-18 15:27:53 +00:00
parent e1b0544668
commit 2e7ee97de9
2 changed files with 39 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,6 +6,7 @@ namespace BizHawk.Client.EmuHawk
public partial class TAStudio : IToolForm
{
private bool _hackyDontUpdate;
private bool _initializing; // If true, will bypass restart logic, this is necessary since loading projects causes a movie to load which causes a rom to reload causing dialogs to restart
public bool UpdateBefore { get { return false; } }
@ -51,9 +52,25 @@ namespace BizHawk.Client.EmuHawk
return;
}
if (_initializing)
{
return;
}
if (_currentTasMovie != null)
{
RefreshDialog();
if (Global.Game.Hash != _currentTasMovie.Hash)
{
TastudioToStopMovie();
TasView.AllColumns.Clear();
NewDefaultProject();
SetUpColumns();
TasView.Refresh();
}
else
{
RefreshDialog();
}
}
}

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

@ -125,7 +125,7 @@ namespace BizHawk.Client.EmuHawk
{
NewTasMovie();
WantsToControlStopMovie = false;
GlobalWin.MainForm.StartNewMovie(_currentTasMovie, record: true);
StartNewMovieWrapper(record: true);
WantsToControlStopMovie = true;
SetTextProperty();
RefreshDialog();
@ -178,7 +178,7 @@ namespace BizHawk.Client.EmuHawk
var shouldRecord = movie.InputLogLength == 0;
var result = GlobalWin.MainForm.StartNewMovie(movie, shouldRecord);
var result = StartNewMovieWrapper(record: true);
if (!result)
{
return false;
@ -409,15 +409,33 @@ namespace BizHawk.Client.EmuHawk
private void NewDefaultProject()
{
NewTasMovie();
GlobalWin.MainForm.StartNewMovie(_currentTasMovie, record: true);
StartNewMovieWrapper(record: true);
_currentTasMovie.TasStateManager.Capture();
_currentTasMovie.SwitchToRecord();
_currentTasMovie.ClearChanges();
}
private bool StartNewMovieWrapper(bool record)
{
_initializing = true;
var result = GlobalWin.MainForm.StartNewMovie(_currentTasMovie, record);
_initializing = false;
return result;
}
#region Dialog Events
private void Tastudio_Load(object sender, EventArgs e)
{
InitializeOnLoad();
LoadConfigSettings();
SetColumnsFromCurrentStickies();
RightClickMenu.Items.AddRange(TasView.GenerateContextMenuItems().ToArray());
RefreshDialog();
}
private void InitializeOnLoad()
{
// Start Scenario 1: A regular movie is active
if (Global.MovieSession.Movie.IsActive && !(Global.MovieSession.Movie is TasMovie))
@ -463,11 +481,6 @@ namespace BizHawk.Client.EmuHawk
{
SetUpColumns();
}
LoadConfigSettings();
SetColumnsFromCurrentStickies();
RightClickMenu.Items.AddRange(TasView.GenerateContextMenuItems().ToArray());
RefreshDialog();
}
private void Tastudio_Closing(object sender, FormClosingEventArgs e)