diff options
| author |  liamwhite | 2023-10-17 11:49:11 -0400 |
|---|---|---|
| committer |  GitHub | 2023-10-17 11:49:11 -0400 |
| commit | bd05ace08d04fe42b9cc94dae611adf2859d7c99 (patch) | |
| tree | 185415915b3aec7b42f4e4be2ae53790c751d168 /src/core/core.cpp | |
| parent | Merge pull request #11747 from Kelebek1/image_alias_sample_names (diff) | |
| parent | fsmitm_romfsbuild: avoid unnecessary copies of vfs pointers (diff) | |
| download | yuzu-bd05ace08d04fe42b9cc94dae611adf2859d7c99.tar.gz yuzu-bd05ace08d04fe42b9cc94dae611adf2859d7c99.tar.xz yuzu-bd05ace08d04fe42b9cc94dae611adf2859d7c99.zip | |
Merge pull request #11774 from liamwhite/refcount-issue
fsmitm_romfsbuild: avoid unnecessary copies of vfs pointers
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)) { |