diff options
| author | 2020-04-17 19:47:11 -0400 | |
|---|---|---|
| committer | 2020-04-17 19:47:11 -0400 | |
| commit | 7438d36d0ee2e9e6997452dd95353768da8d3519 (patch) | |
| tree | fdb0234ea38b0c12dcf96afb5835b53144c58ed2 /src/common/file_util.cpp | |
| parent | Merge pull request #3706 from degasus/fix_fallthrough_error (diff) | |
| parent | common/file_util: Allow access to files on network shares (diff) | |
| download | yuzu-7438d36d0ee2e9e6997452dd95353768da8d3519.tar.gz yuzu-7438d36d0ee2e9e6997452dd95353768da8d3519.tar.xz yuzu-7438d36d0ee2e9e6997452dd95353768da8d3519.zip | |
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 7f613891b..45b750e1e 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 | |||
| 888 | } | 888 | } |
| 889 | 889 | ||
| 890 | std::replace(path.begin(), path.end(), type1, type2); | 890 | std::replace(path.begin(), path.end(), type1, type2); |
| 891 | path.erase(std::unique(path.begin(), path.end(), | 891 | |
| 892 | auto start = path.begin(); | ||
| 893 | #ifdef _WIN32 | ||
| 894 | // allow network paths which start with a double backslash (e.g. \\server\share) | ||
| 895 | if (start != path.end()) | ||
| 896 | ++start; | ||
| 897 | #endif | ||
| 898 | path.erase(std::unique(start, path.end(), | ||
| 892 | [type2](char c1, char c2) { return c1 == type2 && c2 == type2; }), | 899 | [type2](char c1, char c2) { return c1 == type2 && c2 == type2; }), |
| 893 | path.end()); | 900 | path.end()); |
| 894 | return std::string(RemoveTrailingSlash(path)); | 901 | return std::string(RemoveTrailingSlash(path)); |