From 0b5f48aedeb1652e4ae2ac467bf89fb12ea67347 Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz@gmail.com>
Date: Fri, 19 Mar 2021 10:06:02 +1000
Subject: [PATCH] Replace some parameter mutation w/ recursion

---
 .../config/PathEntryCollectionExtensions.cs                    | 2 +-
 src/BizHawk.Client.EmuHawk/config/PathConfig.cs                | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/BizHawk.Client.Common/config/PathEntryCollectionExtensions.cs b/src/BizHawk.Client.Common/config/PathEntryCollectionExtensions.cs
index 578da1ae2d..a9add21bfe 100644
--- a/src/BizHawk.Client.Common/config/PathEntryCollectionExtensions.cs
+++ b/src/BizHawk.Client.Common/config/PathEntryCollectionExtensions.cs
@@ -78,7 +78,7 @@ namespace BizHawk.Client.Common
 			// Hack
 			if (systemId == "Global")
 			{
-				systemId = null;
+				return collection.AbsolutePathForInner(path, systemId: null);
 			}
 
 			// This function translates relative path and special identifiers in absolute paths
diff --git a/src/BizHawk.Client.EmuHawk/config/PathConfig.cs b/src/BizHawk.Client.EmuHawk/config/PathConfig.cs
index 794f060920..31ae3db394 100644
--- a/src/BizHawk.Client.EmuHawk/config/PathConfig.cs
+++ b/src/BizHawk.Client.EmuHawk/config/PathConfig.cs
@@ -202,7 +202,8 @@ namespace BizHawk.Client.EmuHawk
 			// Ugly hack, we don't want to pass in the system in for system base and global paths
 			if (name == "Base" || system == "Global" || system == "Global_NULL")
 			{
-				system = null;
+				BrowseFolder(box, name, system: null);
+				return;
 			}
 
 			DialogResult result;