diff options
| author |  bunnei | 2021-06-22 17:21:59 -0700 |
|---|---|---|
| committer |  GitHub | 2021-06-22 17:21:59 -0700 |
| commit | 0308a2679ed87aa9cb07e2bde19e165dc454c322 (patch) | |
| tree | a1d29aacabab533673bff8043ec11864d68ed022 /src/common/fs/fs.cpp | |
| parent | Merge pull request #6472 from Morph1984/spl (diff) | |
| parent | common: fs: Add a description of a regular file in IsFile (diff) | |
| download | yuzu-0308a2679ed87aa9cb07e2bde19e165dc454c322.tar.gz yuzu-0308a2679ed87aa9cb07e2bde19e165dc454c322.tar.xz yuzu-0308a2679ed87aa9cb07e2bde19e165dc454c322.zip | |
Merge pull request #6493 from Morph1984/fs-nodiscard
common: fs: Miscellaneous changes
Diffstat (limited to 'src/common/fs/fs.cpp')
| -rw-r--r-- | src/common/fs/fs.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/common/fs/fs.cpp b/src/common/fs/fs.cpp index d3159e908..9089cad67 100644 --- a/src/common/fs/fs.cpp +++ b/src/common/fs/fs.cpp | |||
| @@ -135,8 +135,9 @@ std::shared_ptr<IOFile> FileOpen(const fs::path& path, FileAccessMode mode, File | |||
| 135 | return nullptr; | 135 | return nullptr; |
| 136 | } | 136 | } |
| 137 | 137 | ||
| 138 | if (!IsFile(path)) { | 138 | if (Exists(path) && !IsFile(path)) { |
| 139 | LOG_ERROR(Common_Filesystem, "Filesystem object at path={} is not a file", | 139 | LOG_ERROR(Common_Filesystem, |
| 140 | "Filesystem object at path={} exists and is not a regular file", | ||
| 140 | PathToUTF8String(path)); | 141 | PathToUTF8String(path)); |
| 141 | return nullptr; | 142 | return nullptr; |
| 142 | } | 143 | } |