summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Russell <ben@benru.co.uk>2020-04-09 19:48:28 +0200
committerBen Russell <ben@benru.co.uk>2020-04-09 19:48:28 +0200
commitf98a2c42dee1a3c20f4a4e876069a32982395f05 (patch)
tree22172412be7f662a9f9a23b091b719d4aed22ed6
parentMerge pull request #3601 from ReinUsesLisp/some-shader-encodings (diff)
downloadyuzu-f98a2c42dee1a3c20f4a4e876069a32982395f05.tar
yuzu-f98a2c42dee1a3c20f4a4e876069a32982395f05.tar.gz
yuzu-f98a2c42dee1a3c20f4a4e876069a32982395f05.tar.bz2
yuzu-f98a2c42dee1a3c20f4a4e876069a32982395f05.tar.lz
yuzu-f98a2c42dee1a3c20f4a4e876069a32982395f05.tar.xz
yuzu-f98a2c42dee1a3c20f4a4e876069a32982395f05.tar.zst
yuzu-f98a2c42dee1a3c20f4a4e876069a32982395f05.zip
-rw-r--r--src/common/file_util.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp
index 35eee0096..28a16077d 100644
--- a/src/common/file_util.cpp
+++ b/src/common/file_util.cpp
@@ -888,7 +888,14 @@ std::string SanitizePath(std::string_view path_, DirectorySeparator directory_se
}
std::replace(path.begin(), path.end(), type1, type2);
- path.erase(std::unique(path.begin(), path.end(),
+
+ auto start = path.begin();
+#ifdef _WIN32
+ // allow network paths which start with a double backslash (e.g. \\server\share)
+ if (start != path.end())
+ ++start;
+#endif
+ path.erase(std::unique(start, path.end(),
[type2](char c1, char c2) { return c1 == type2 && c2 == type2; }),
path.end());
return std::string(RemoveTrailingSlash(path));