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

TAStudio: Squish some more exceptions 

- Opening a TASProj or closing BizHawk with the Virtual Pad open
- Opening TAStudio with small window size saved in settings
This commit is contained in:
Isotarge 2018-10-19 12:35:14 +10:30
parent c5407472cd
commit e808618981
2 changed files with 21 additions and 3 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

@ -283,12 +283,27 @@ namespace BizHawk.Client.EmuHawk
if (Settings.MainVerticalSplitDistance > 0)
{
MainVertialSplit.SplitterDistance = Settings.MainVerticalSplitDistance;
try
{
MainVertialSplit.SplitterDistance = Settings.MainVerticalSplitDistance;
}
catch (Exception)
{
MainVertialSplit.SplitterDistance = defaultMainSplitDistance;
}
}
if (Settings.BranchMarkerSplitDistance > 0)
{
BranchesMarkersSplit.SplitterDistance = Settings.BranchMarkerSplitDistance;
try
{
BranchesMarkersSplit.SplitterDistance = Settings.BranchMarkerSplitDistance;
}
catch (Exception)
{
BranchesMarkersSplit.SplitterDistance = defaultBranchMarkerSplitDistance;
}
}
RefreshDialog();

5
BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs
View File

@ -182,7 +182,10 @@ namespace BizHawk.Client.EmuHawk
if (Global.MovieSession.Movie.IsPlaying && !Global.MovieSession.Movie.IsFinished)
{
Readonly = true;
Pads.ForEach(p => p.Set(Global.MovieSession.CurrentInput));
if (Global.MovieSession.CurrentInput != null)
{
Pads.ForEach(p => p.Set(Global.MovieSession.CurrentInput));
}
}
else
{