diff --git a/BizHawk.Client.EmuHawk/config/PathConfig.cs b/BizHawk.Client.EmuHawk/config/PathConfig.cs index 0c04112c85..29b81881d8 100644 --- a/BizHawk.Client.EmuHawk/config/PathConfig.cs +++ b/BizHawk.Client.EmuHawk/config/PathConfig.cs @@ -60,15 +60,23 @@ namespace BizHawk.Client.EmuHawk private void SetDefaultFocusedTab() { - PathTabControl.SelectTab(FindTabByName(Global.Game.System)); + var tab = FindTabByName(Global.Game.System); + if (tab != null) + { + PathTabControl.SelectTab(tab); + } } private TabPage FindTabByName(string name) { + var global = PathTabControl.TabPages + .OfType() + .First(x => x.Name.ToUpper().Contains("GLOBAL")); + return PathTabControl.TabPages .OfType() - .FirstOrDefault(x => x.Name.ToUpper().StartsWith(name.ToUpper())) - ?? new TabPage(); + .FirstOrDefault(x => x.Name.ToUpper().StartsWith(name.ToUpper())) + ?? global; } private void DoTabs(List pathCollection)