diff options
| author |  bunnei | 2018-09-26 16:09:16 -0400 |
|---|---|---|
| committer |  GitHub | 2018-09-26 16:09:16 -0400 |
| commit | 92dd496fb94385aa16adec75d6eb8bc3ef29c6b0 (patch) | |
| tree | 113a0ad25b279c70d825514e9e35020f08a366a4 /src/core/core.cpp | |
| parent | Merge pull request #1398 from lioncash/macos (diff) | |
| parent | patch_manager: Invert conditionals within ApplyLayeredFS() (diff) | |
| download | yuzu-92dd496fb94385aa16adec75d6eb8bc3ef29c6b0.tar.gz yuzu-92dd496fb94385aa16adec75d6eb8bc3ef29c6b0.tar.xz yuzu-92dd496fb94385aa16adec75d6eb8bc3ef29c6b0.zip | |
Merge pull request #1401 from lioncash/vfs
vfs: Minor cleanup related changes to layered VFS code
Diffstat (limited to 'src/core/core.cpp')
| -rw-r--r-- | src/core/core.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index 50f0a42fb..7666354dc 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp | |||
| @@ -64,7 +64,7 @@ FileSys::VirtualFile GetGameFileFromPath(const FileSys::VirtualFilesystem& vfs, | |||
| 64 | if (concat.empty()) | 64 | if (concat.empty()) |
| 65 | return nullptr; | 65 | return nullptr; |
| 66 | 66 | ||
| 67 | return FileSys::ConcatenateFiles(concat, dir->GetName()); | 67 | return FileSys::ConcatenatedVfsFile::MakeConcatenatedFile(concat, dir->GetName()); |
| 68 | } | 68 | } |
| 69 | 69 | ||
| 70 | return vfs->OpenFile(path, FileSys::Mode::Read); | 70 | return vfs->OpenFile(path, FileSys::Mode::Read); |