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

A little more elegant (and secure) solution for the bug fixed in r8728

This commit is contained in:
christoph.boehmwalder 2015-01-03 14:03:13 +00:00
parent dcda3ff393
commit 7f6e651c08
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs
View File

@ -77,9 +77,7 @@ namespace BizHawk.Client.EmuHawk
}
else
{
//CurrentTasMovie.Save();
//MessageStatusLabel.Text = Path.GetFileName(CurrentTasMovie.Filename) + " saved.";
_saveBackgroundWorker.RunWorkerAsync();
_saveBackgroundWorker.RunWorkerAsync();
Settings.RecentTas.Add(CurrentTasMovie.Filename);
}
}
@ -97,10 +95,8 @@ namespace BizHawk.Client.EmuHawk
{
CurrentTasMovie.Filename = file.FullName;
//CurrentTasMovie.Save();
_saveBackgroundWorker.RunWorkerAsync();
Settings.RecentTas.Add(CurrentTasMovie.Filename);
//MessageStatusLabel.Text = Path.GetFileName(CurrentTasMovie.Filename) + " saved.";
SetTextProperty();
}
}

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

@ -555,12 +555,13 @@ namespace BizHawk.Client.EmuHawk
private void Tastudio_Load(object sender, EventArgs e)
{
InitializeOnLoad();
if(CurrentTasMovie == null) // dialog was aborted
if(!InitializeOnLoad())
{
Close();
this.DialogResult = System.Windows.Forms.DialogResult.Cancel;
return;
}
SetColumnsFromCurrentStickies();
if (VersionInfo.DeveloperBuild)
@ -579,7 +580,7 @@ namespace BizHawk.Client.EmuHawk
RefreshDialog();
}
private void InitializeOnLoad()
private bool InitializeOnLoad()
{
// Start Scenario 1: A regular movie is active
if (Global.MovieSession.Movie.IsActive && !(Global.MovieSession.Movie is TasMovie))
@ -592,7 +593,7 @@ namespace BizHawk.Client.EmuHawk
}
else
{
return;
return false;
}
}
@ -625,6 +626,7 @@ namespace BizHawk.Client.EmuHawk
{
SetUpColumns();
}
return true;
}
private void Tastudio_Closing(object sender, FormClosingEventArgs e)