diff options
| author | bunnei <bunneidev@gmail.com> | 2020-04-17 19:47:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-17 19:47:11 -0400 |
| commit | 7438d36d0ee2e9e6997452dd95353768da8d3519 (patch) | |
| tree | fdb0234ea38b0c12dcf96afb5835b53144c58ed2 /src/common/file_util.cpp | |
| parent | 30b59b732c906a79fc104d43114f2d2481577b9b (diff) | |
| parent | f98a2c42dee1a3c20f4a4e876069a32982395f05 (diff) | |
Merge pull request #3630 from benru/open-windows-network-files
common/file_util: Allow access to files on network shares
Diffstat (limited to 'src/common/file_util.cpp')
| -rw-r--r-- | src/common/file_util.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp index 7f613891b3..45b750e1eb 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)); |