From b5f6004674154341af4d292f30c907035905dc7d Mon Sep 17 00:00:00 2001 From: adelikat Date: Mon, 21 Jul 2014 23:22:22 +0000 Subject: [PATCH] Fix Issue 218, Global ROM folder now works --- BizHawk.Client.Common/PathManager.cs | 2 +- BizHawk.Client.Common/config/PathEntry.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/BizHawk.Client.Common/PathManager.cs b/BizHawk.Client.Common/PathManager.cs index 85f0805388..fc81f59b6e 100644 --- a/BizHawk.Client.Common/PathManager.cs +++ b/BizHawk.Client.Common/PathManager.cs @@ -219,7 +219,7 @@ namespace BizHawk.Client.Common return Environment.SpecialFolder.Recent.ToString(); } - var path = Global.Config.PathEntries[sysID, "ROM"] ?? Global.Config.PathEntries[sysID, "Base"]; + var path = Global.Config.PathEntries[sysID, "ROM"] ?? Global.Config.PathEntries["Global", "ROM"] ?? Global.Config.PathEntries[sysID, "Base"]; return MakeAbsolutePath(path.Path, sysID); } diff --git a/BizHawk.Client.Common/config/PathEntry.cs b/BizHawk.Client.Common/config/PathEntry.cs index 2f3697ba2f..321ada5183 100644 --- a/BizHawk.Client.Common/config/PathEntry.cs +++ b/BizHawk.Client.Common/config/PathEntry.cs @@ -134,7 +134,7 @@ namespace BizHawk.Client.Common public string LogPathFragment { get { return Global.Config.PathEntries["Global", "Debug Logs"].Path; } } public string FirmwaresPathFragment { get { return Global.Config.PathEntries["Global", "Firmware"].Path; } } public string AvPathFragment { get { return Global.Config.PathEntries["Global", "A/V Dumps"].Path; } } - + public string GlobalRomFragment { get { return Global.Config.PathEntries["Global", "ROM"].Path; } } //this one is special public string GlobalBaseFragment { get { return Global.Config.PathEntries["Global", "Base"].Path; } }