diff options
| author | bunnei <bunneidev@gmail.com> | 2018-07-27 19:10:05 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-27 19:10:05 -0700 |
| commit | abb489418834848965f6ccb38d2cd7cf01cedf35 (patch) | |
| tree | beff5b868534a8bfb4eea7992553fa5fb5db5287 /src/core/file_sys/vfs_offset.cpp | |
| parent | 0191a1e526f62a16a14ce92c354429807cca01a5 (diff) | |
| parent | 906d785c73cb3644e8984fbfcbf5fcb8a1ebbc6f (diff) | |
Merge pull request #696 from DarkLordZach/romfs
RomFS Extraction
Diffstat (limited to 'src/core/file_sys/vfs_offset.cpp')
| -rw-r--r-- | src/core/file_sys/vfs_offset.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/core/file_sys/vfs_offset.cpp b/src/core/file_sys/vfs_offset.cpp index a40331cef..847cde2f5 100644 --- a/src/core/file_sys/vfs_offset.cpp +++ b/src/core/file_sys/vfs_offset.cpp @@ -10,8 +10,9 @@ namespace FileSys { OffsetVfsFile::OffsetVfsFile(std::shared_ptr<VfsFile> file_, size_t size_, size_t offset_, - std::string name_) - : file(std::move(file_)), offset(offset_), size(size_), name(std::move(name_)) {} + std::string name_, VirtualDir parent_) + : file(file_), offset(offset_), size(size_), name(std::move(name_)), + parent(parent_ == nullptr ? file->GetContainingDirectory() : std::move(parent_)) {} std::string OffsetVfsFile::GetName() const { return name.empty() ? file->GetName() : name; @@ -35,7 +36,7 @@ bool OffsetVfsFile::Resize(size_t new_size) { } std::shared_ptr<VfsDirectory> OffsetVfsFile::GetContainingDirectory() const { - return file->GetContainingDirectory(); + return parent; } bool OffsetVfsFile::IsWritable() const { |
