diff options
author | Zach Hilman <zachhilman@gmail.com> | 2018-08-12 04:45:30 +0200 |
---|---|---|
committer | Zach Hilman <zachhilman@gmail.com> | 2018-08-12 04:50:48 +0200 |
commit | dda8ef11c7a167ab4f32c84c55d9b8977fa92eb9 (patch) | |
tree | 917959dcdf6a1ee0468f447b4cf58deb45ff629b | |
parent | romfs: Remove cyclic shared_ptr leak in romfs code (diff) | |
download | yuzu-dda8ef11c7a167ab4f32c84c55d9b8977fa92eb9.tar yuzu-dda8ef11c7a167ab4f32c84c55d9b8977fa92eb9.tar.gz yuzu-dda8ef11c7a167ab4f32c84c55d9b8977fa92eb9.tar.bz2 yuzu-dda8ef11c7a167ab4f32c84c55d9b8977fa92eb9.tar.lz yuzu-dda8ef11c7a167ab4f32c84c55d9b8977fa92eb9.tar.xz yuzu-dda8ef11c7a167ab4f32c84c55d9b8977fa92eb9.tar.zst yuzu-dda8ef11c7a167ab4f32c84c55d9b8977fa92eb9.zip |
-rw-r--r-- | src/core/file_sys/control_metadata.cpp | 2 | ||||
-rw-r--r-- | src/core/file_sys/control_metadata.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/core/file_sys/control_metadata.cpp b/src/core/file_sys/control_metadata.cpp index 3ddc9f162..ae21ad5b9 100644 --- a/src/core/file_sys/control_metadata.cpp +++ b/src/core/file_sys/control_metadata.cpp @@ -16,7 +16,7 @@ std::string LanguageEntry::GetDeveloperName() const { return Common::StringFromFixedZeroTerminatedBuffer(developer_name.data(), 0x100); } -NACP::NACP(VirtualFile file_) : file(std::move(file_)), raw(std::make_unique<RawNACP>()) { +NACP::NACP(VirtualFile file) : raw(std::make_unique<RawNACP>()) { file->ReadObject(raw.get()); } diff --git a/src/core/file_sys/control_metadata.h b/src/core/file_sys/control_metadata.h index 6582cc240..8c2cc1a2a 100644 --- a/src/core/file_sys/control_metadata.h +++ b/src/core/file_sys/control_metadata.h @@ -81,7 +81,6 @@ public: std::string GetVersionString() const; private: - VirtualFile file; std::unique_ptr<RawNACP> raw; }; |