diff options
author | 2022-12-16 14:03:59 -0500 | |
---|---|---|
committer | 2022-12-17 06:03:59 +1100 | |
commit | 13910382a5e846677f30d1645bfb44e4983de557 (patch) | |
tree | bc75e208d5dc4305a6721dff63efaec2864db178 /src/osd/modules/file/winrtfile.cpp | |
parent | 14c3d33e86ceeeeb57c44cb7d6aa85685f79813a (diff) |
osd/modules/file: Don't magically substitute environment variables when opening files. (#9859)
* util/options.cpp: Added option types for single and multiple paths.
* util/options.cpp: Substitute environment variables in values from defaults and INI files.
* ui/dirmenu.cpp: Removed hard-coded list of multi-path options.
* plugins: Don't substitute environment variables in path options.
Diffstat (limited to 'src/osd/modules/file/winrtfile.cpp')
-rw-r--r-- | src/osd/modules/file/winrtfile.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/osd/modules/file/winrtfile.cpp b/src/osd/modules/file/winrtfile.cpp index 3de1c19605d..5053f6e0199 100644 --- a/src/osd/modules/file/winrtfile.cpp +++ b/src/osd/modules/file/winrtfile.cpp @@ -160,12 +160,8 @@ DWORD create_path_recursive(TCHAR *path) // osd_open //============================================================ -osd_file::error osd_file::open(std::string const &orig_path, uint32_t openflags, ptr &file, std::uint64_t &filesize) +osd_file::error osd_file::open(std::string const &path, uint32_t openflags, ptr &file, std::uint64_t &filesize) { - std::string path; - try { path = osd_subst_env(orig_path); } - catch (...) { return std::errc::not_enough_memory; } - if (win_check_socket_path(path)) return win_open_socket(path, openflags, file, filesize); else if (win_check_ptty_path(path)) |