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

Replace goto without throwing

This commit is contained in:
YoshiRulz 2020-10-02 04:19:01 +10:00
parent f363acd16a
commit 60da770532
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
1 changed files with 42 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
src/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskBundler.cs
View File

@ -178,57 +178,56 @@ namespace BizHawk.Client.EmuHawk
{
var names = FileSelectors.Select(f => f.Path).ToList();
if (names.Count == 0)
goto BAIL;
var name = NameBox.Text;
if (string.IsNullOrWhiteSpace(name))
if (names.Count != 0)
{
throw new Exception("Xml Filename can not be blank");
var name = NameBox.Text;
if (string.IsNullOrWhiteSpace(name))
{
throw new Exception("Xml Filename can not be blank");
}
if (names.Any(string.IsNullOrWhiteSpace))
{
throw new Exception("Rom Names can not be blank");
}
var system = SystemDropDown.SelectedItem?.ToString();
if (string.IsNullOrWhiteSpace(system))
{
throw new Exception("System Id can not be blank");
}
var basePath = Path.GetDirectoryName(name.Split('|').First());
if (string.IsNullOrEmpty(basePath))
{
var fileInfo = new FileInfo(name);
basePath = Path.GetDirectoryName(fileInfo.FullName);
}
_currentXml = new XElement("BizHawk-XMLGame",
new XAttribute("System", system),
new XAttribute("Name", Path.GetFileNameWithoutExtension(name)),
new XElement("LoadAssets",
names.Select(n => new XElement(
"Asset",
new XAttribute("FileName", PathExtensions.GetRelativePath(basePath, n))
))
)
);
SaveRunButton.Enabled = true;
SaveButton.Enabled = true;
return true;
}
if (names.Any(string.IsNullOrWhiteSpace))
{
throw new Exception("Rom Names can not be blank");
}
var system = SystemDropDown.SelectedItem?.ToString();
if (string.IsNullOrWhiteSpace(system))
{
throw new Exception("System Id can not be blank");
}
var basePath = Path.GetDirectoryName(name.Split('|').First());
if (string.IsNullOrEmpty(basePath))
{
var fileInfo = new FileInfo(name);
basePath = Path.GetDirectoryName(fileInfo.FullName);
}
_currentXml = new XElement("BizHawk-XMLGame",
new XAttribute("System", system),
new XAttribute("Name", Path.GetFileNameWithoutExtension(name)),
new XElement("LoadAssets",
names.Select(n => new XElement(
"Asset",
new XAttribute("FileName", PathExtensions.GetRelativePath(basePath, n))
))
)
);
SaveRunButton.Enabled = true;
SaveButton.Enabled = true;
return true;
}
catch (Exception)
{
//swallow exceptions, since this is just validation logic
}
BAIL:
_currentXml = null;
SaveRunButton.Enabled = false;
SaveButton.Enabled = false;