From 46dfb3449c1aa3114c1b533be9b0d79f0c1ef3d5 Mon Sep 17 00:00:00 2001
From: gibbed <rick@gibbed.us>
Date: Sun, 2 May 2021 08:10:46 -0500
Subject: [PATCH] [Base] Dedupe new/old separators in UTF-8 fps.

[Base] Dedupe new/old separators in UTF-8 fix_path_separators.
---
 src/xenia/base/utf8.cc | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/xenia/base/utf8.cc b/src/xenia/base/utf8.cc
index 364b8314a..b30d8efa8 100644
--- a/src/xenia/base/utf8.cc
+++ b/src/xenia/base/utf8.cc
@@ -517,8 +517,20 @@ std::string fix_path_separators(const std::string_view path,
   std::string result;
   auto it = path_begin;
   auto last = it;
+
+  auto is_separator = [old_separator, new_separator](char32_t c) {
+    return c == uint32_t(old_separator) || c == uint32_t(new_separator);
+  };
+
+  // Begins with a separator
+  if (is_separator(*it)) {
+    utfcpp::append(new_separator, result);
+    ++it;
+    last = it;
+  }
+
   for (;;) {
-    it = std::find(it, path_end, uint32_t(old_separator));
+    it = std::find_if(it, path_end, is_separator);
     if (it == path_end) {
       break;
     }