diff options
| author |  Franco M | 2023-10-18 01:06:58 -0300 |
|---|---|---|
| committer |  GitHub | 2023-10-18 01:06:58 -0300 |
| commit | 59b6ada7b7ef44ca883613567459b7156e55e1c8 (patch) | |
| tree | ab8892a2edf7ef24be813ce45726ed9f053a48fd /src/core/core.cpp | |
| parent | Final refactorization (diff) | |
| parent | Merge pull request #11774 from liamwhite/refcount-issue (diff) | |
| download | yuzu-59b6ada7b7ef44ca883613567459b7156e55e1c8.tar.gz yuzu-59b6ada7b7ef44ca883613567459b7156e55e1c8.tar.xz yuzu-59b6ada7b7ef44ca883613567459b7156e55e1c8.zip | |
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, | |||
| 116 | } | 116 | } |
| 117 | } | 117 | } |
| 118 | 118 | ||
| 119 | if (concat.empty()) { | 119 | return FileSys::ConcatenatedVfsFile::MakeConcatenatedFile(dir->GetName(), |
| 120 | return nullptr; | 120 | std::move(concat)); |
| 121 | } | ||
| 122 | |||
| 123 | return FileSys::ConcatenatedVfsFile::MakeConcatenatedFile(concat, dir->GetName()); | ||
| 124 | } | 121 | } |
| 125 | 122 | ||
| 126 | if (Common::FS::IsDir(path)) { | 123 | if (Common::FS::IsDir(path)) { |