Fix a bunch of exceptions in Path Config dialog
This commit is contained in:
parent
def23fbd0f
commit
5fb8ceb377
|
@ -17,7 +17,14 @@ namespace BizHawk.Client.Common
|
||||||
|
|
||||||
public bool HasSystem(string systemID)
|
public bool HasSystem(string systemID)
|
||||||
{
|
{
|
||||||
return System.Split('_').Contains(systemID);
|
if (systemID == System)
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return System.Split('_').Contains(systemID);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -77,8 +77,6 @@ namespace BizHawk.Client.EmuHawk
|
||||||
BasePathBox.Text = Global.Config.PathEntries.GlobalBase;
|
BasePathBox.Text = Global.Config.PathEntries.GlobalBase;
|
||||||
|
|
||||||
StartTabPages();
|
StartTabPages();
|
||||||
//DoTabs(Global.Config.PathEntries.Paths);
|
|
||||||
|
|
||||||
SetDefaultFocusedTab();
|
SetDefaultFocusedTab();
|
||||||
DoRomToggle();
|
DoRomToggle();
|
||||||
}
|
}
|
||||||
|
@ -325,7 +323,7 @@ namespace BizHawk.Client.EmuHawk
|
||||||
private void BrowseFolder(TextBox box, string name, string system)
|
private void BrowseFolder(TextBox box, string name, string system)
|
||||||
{
|
{
|
||||||
//Ugly hack, we don't want to pass in the system in for system base and global paths
|
//Ugly hack, we don't want to pass in the system in for system base and global paths
|
||||||
if (name == "Base" || system == "Global")
|
if (name == "Base" || system == "Global" || system == "Global_NULL")
|
||||||
{
|
{
|
||||||
system = null;
|
system = null;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue