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

Fix NullReferenceException when aborting TAStudio movie conversion while recording.

This commit is contained in:
christoph.boehmwalder 2015-01-03 03:30:34 +00:00
parent 2f8a59a219
commit 29923329e9
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -556,6 +556,11 @@ namespace BizHawk.Client.EmuHawk
private void Tastudio_Load(object sender, EventArgs e)
{
InitializeOnLoad();
if(CurrentTasMovie == null) // dialog was aborted
{
Close();
return;
}
SetColumnsFromCurrentStickies();
if (VersionInfo.DeveloperBuild)
@ -587,7 +592,6 @@ namespace BizHawk.Client.EmuHawk
}
else
{
Close();
return;
}
}