diff options
| author | Franco M <francomaro@gmail.com> | 2023-10-18 01:06:58 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-18 01:06:58 -0300 |
| commit | 59b6ada7b7ef44ca883613567459b7156e55e1c8 (patch) | |
| tree | ab8892a2edf7ef24be813ce45726ed9f053a48fd /src/core/core.cpp | |
| parent | 9908434c14d68faa7fde933258aafd7da15b3b3b (diff) | |
| parent | bd05ace08d04fe42b9cc94dae611adf2859d7c99 (diff) | |
Merge branch 'yuzu-emu:master' into new-shortcut
Diffstat (limited to 'src/core/core.cpp')
| -rw-r--r-- | src/core/core.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index 0ab2e3b76..d7e2efbd7 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -116,11 +116,8 @@ FileSys::VirtualFile GetGameFileFromPath(const FileSys::VirtualFilesystem& vfs, } } - if (concat.empty()) { - return nullptr; - } - - return FileSys::ConcatenatedVfsFile::MakeConcatenatedFile(concat, dir->GetName()); + return FileSys::ConcatenatedVfsFile::MakeConcatenatedFile(dir->GetName(), + std::move(concat)); } if (Common::FS::IsDir(path)) { |