diff options
| author |  liamwhite | 2023-05-28 13:17:42 -0400 |
|---|---|---|
| committer |  GitHub | 2023-05-28 13:17:42 -0400 |
| commit | 93c17ee4da9ba8475d4573489eab11ff46ccfe5a (patch) | |
| tree | 6c70b6145340022e7ba61d7880fefa4c5169edee /src/core/core.cpp | |
| parent | Merge pull request #10464 from liamwhite/clear-cache (diff) | |
| parent | vfs_concat: fix time complexity of read (diff) | |
| download | yuzu-93c17ee4da9ba8475d4573489eab11ff46ccfe5a.tar.gz yuzu-93c17ee4da9ba8475d4573489eab11ff46ccfe5a.tar.xz yuzu-93c17ee4da9ba8475d4573489eab11ff46ccfe5a.zip | |
Merge pull request #10463 from liamwhite/this-is-why-we-need-g
vfs_concat: fix time complexity of read
Diffstat (limited to 'src/core/core.cpp')
| -rw-r--r-- | src/core/core.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index b5f62690e..4406ae30e 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp | |||
| @@ -117,8 +117,7 @@ FileSys::VirtualFile GetGameFileFromPath(const FileSys::VirtualFilesystem& vfs, | |||
| 117 | return nullptr; | 117 | return nullptr; |
| 118 | } | 118 | } |
| 119 | 119 | ||
| 120 | return FileSys::ConcatenatedVfsFile::MakeConcatenatedFile(std::move(concat), | 120 | return FileSys::ConcatenatedVfsFile::MakeConcatenatedFile(concat, dir->GetName()); |
| 121 | dir->GetName()); | ||
| 122 | } | 121 | } |
| 123 | 122 | ||
| 124 | if (Common::FS::IsDir(path)) { | 123 | if (Common::FS::IsDir(path)) { |