diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2023-10-17 17:49:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-17 17:49:11 +0200 |
| commit | bd05ace08d04fe42b9cc94dae611adf2859d7c99 (patch) | |
| tree | 185415915b3aec7b42f4e4be2ae53790c751d168 /src/core/file_sys/romfs.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 yuzu-bd05ace08d04fe42b9cc94dae611adf2859d7c99.tar.gz yuzu-bd05ace08d04fe42b9cc94dae611adf2859d7c99.tar.bz2 yuzu-bd05ace08d04fe42b9cc94dae611adf2859d7c99.tar.lz yuzu-bd05ace08d04fe42b9cc94dae611adf2859d7c99.tar.xz yuzu-bd05ace08d04fe42b9cc94dae611adf2859d7c99.tar.zst yuzu-bd05ace08d04fe42b9cc94dae611adf2859d7c99.zip | |
Diffstat (limited to 'src/core/file_sys/romfs.cpp')
| -rw-r--r-- | src/core/file_sys/romfs.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/core/file_sys/romfs.cpp b/src/core/file_sys/romfs.cpp index 614da2130..1c580de57 100644 --- a/src/core/file_sys/romfs.cpp +++ b/src/core/file_sys/romfs.cpp @@ -133,7 +133,7 @@ VirtualDir ExtractRomFS(VirtualFile file, RomFSExtractionType type) { out = out->GetSubdirectories().front(); } - return std::make_shared<CachedVfsDirectory>(out); + return std::make_shared<CachedVfsDirectory>(std::move(out)); } VirtualFile CreateRomFS(VirtualDir dir, VirtualDir ext) { @@ -141,8 +141,7 @@ VirtualFile CreateRomFS(VirtualDir dir, VirtualDir ext) { return nullptr; RomFSBuildContext ctx{dir, ext}; - auto file_map = ctx.Build(); - return ConcatenatedVfsFile::MakeConcatenatedFile(0, file_map, dir->GetName()); + return ConcatenatedVfsFile::MakeConcatenatedFile(0, dir->GetName(), ctx.Build()); } } // namespace FileSys |