diff options
| -rw-r--r-- | src/core/file_sys/nca_metadata.cpp | 4 | ||||
| -rw-r--r-- | src/core/file_sys/nca_metadata.h | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/core/file_sys/nca_metadata.cpp b/src/core/file_sys/nca_metadata.cpp index 118a0c287..38b5eae80 100644 --- a/src/core/file_sys/nca_metadata.cpp +++ b/src/core/file_sys/nca_metadata.cpp | |||
| @@ -10,7 +10,7 @@ | |||
| 10 | 10 | ||
| 11 | namespace FileSys { | 11 | namespace FileSys { |
| 12 | 12 | ||
| 13 | CNMT::CNMT(VirtualFile file_) : file(std::move(file_)), header(std::make_unique<CNMTHeader>()) { | 13 | CNMT::CNMT(VirtualFile file) : header(std::make_unique<CNMTHeader>()) { |
| 14 | if (file->ReadObject(header.get()) != sizeof(CNMTHeader)) | 14 | if (file->ReadObject(header.get()) != sizeof(CNMTHeader)) |
| 15 | return; | 15 | return; |
| 16 | 16 | ||
| @@ -41,7 +41,7 @@ CNMT::CNMT(VirtualFile file_) : file(std::move(file_)), header(std::make_unique< | |||
| 41 | 41 | ||
| 42 | CNMT::CNMT(CNMTHeader header, OptionalHeader opt_header, std::vector<ContentRecord> content_records, | 42 | CNMT::CNMT(CNMTHeader header, OptionalHeader opt_header, std::vector<ContentRecord> content_records, |
| 43 | std::vector<MetaRecord> meta_records) | 43 | std::vector<MetaRecord> meta_records) |
| 44 | : file(nullptr), header(std::make_unique<CNMTHeader>(std::move(header))), | 44 | : header(std::make_unique<CNMTHeader>(std::move(header))), |
| 45 | opt_header(std::make_unique<OptionalHeader>(std::move(opt_header))), | 45 | opt_header(std::make_unique<OptionalHeader>(std::move(opt_header))), |
| 46 | content_records(std::move(content_records)), meta_records(std::move(meta_records)) {} | 46 | content_records(std::move(content_records)), meta_records(std::move(meta_records)) {} |
| 47 | 47 | ||
diff --git a/src/core/file_sys/nca_metadata.h b/src/core/file_sys/nca_metadata.h index 6cd919e54..c1ca9b061 100644 --- a/src/core/file_sys/nca_metadata.h +++ b/src/core/file_sys/nca_metadata.h | |||
| @@ -96,7 +96,6 @@ public: | |||
| 96 | std::vector<u8> Serialize() const; | 96 | std::vector<u8> Serialize() const; |
| 97 | 97 | ||
| 98 | private: | 98 | private: |
| 99 | VirtualFile file; | ||
| 100 | std::unique_ptr<CNMTHeader> header; | 99 | std::unique_ptr<CNMTHeader> header; |
| 101 | std::unique_ptr<OptionalHeader> opt_header; | 100 | std::unique_ptr<OptionalHeader> opt_header; |
| 102 | std::vector<ContentRecord> content_records; | 101 | std::vector<ContentRecord> content_records; |