diff options
| author | bunnei <bunneidev@gmail.com> | 2018-10-10 04:29:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-10 04:29:39 +0200 |
| commit | 3ac874c32ebba99c5d1402ea6b82277e7f303b93 (patch) | |
| tree | fa616d3b0c8846a143916261f74278d6509233d4 /src/core/loader | |
| parent | Merge pull request #1466 from lioncash/unused (diff) | |
| parent | patch_manager: Return a std::unique_ptr from ParseControlNCA() and GetControlMetadata() instead of a std::shared_ptr (diff) | |
| download | yuzu-3ac874c32ebba99c5d1402ea6b82277e7f303b93.tar yuzu-3ac874c32ebba99c5d1402ea6b82277e7f303b93.tar.gz yuzu-3ac874c32ebba99c5d1402ea6b82277e7f303b93.tar.bz2 yuzu-3ac874c32ebba99c5d1402ea6b82277e7f303b93.tar.lz yuzu-3ac874c32ebba99c5d1402ea6b82277e7f303b93.tar.xz yuzu-3ac874c32ebba99c5d1402ea6b82277e7f303b93.tar.zst yuzu-3ac874c32ebba99c5d1402ea6b82277e7f303b93.zip | |
Diffstat (limited to 'src/core/loader')
| -rw-r--r-- | src/core/loader/nsp.cpp | 2 | ||||
| -rw-r--r-- | src/core/loader/nsp.h | 2 | ||||
| -rw-r--r-- | src/core/loader/xci.cpp | 2 | ||||
| -rw-r--r-- | src/core/loader/xci.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/core/loader/nsp.cpp b/src/core/loader/nsp.cpp index 5534ce01c..13e57848d 100644 --- a/src/core/loader/nsp.cpp +++ b/src/core/loader/nsp.cpp @@ -35,7 +35,7 @@ AppLoader_NSP::AppLoader_NSP(FileSys::VirtualFile file) return; std::tie(nacp_file, icon_file) = - FileSys::PatchManager(nsp->GetProgramTitleID()).ParseControlNCA(control_nca); + FileSys::PatchManager(nsp->GetProgramTitleID()).ParseControlNCA(*control_nca); } AppLoader_NSP::~AppLoader_NSP() = default; diff --git a/src/core/loader/nsp.h b/src/core/loader/nsp.h index b006594a6..db91cd01e 100644 --- a/src/core/loader/nsp.h +++ b/src/core/loader/nsp.h @@ -49,7 +49,7 @@ private: std::unique_ptr<AppLoader> secondary_loader; FileSys::VirtualFile icon_file; - std::shared_ptr<FileSys::NACP> nacp_file; + std::unique_ptr<FileSys::NACP> nacp_file; u64 title_id; }; diff --git a/src/core/loader/xci.cpp b/src/core/loader/xci.cpp index ee5452eb9..7a619acb4 100644 --- a/src/core/loader/xci.cpp +++ b/src/core/loader/xci.cpp @@ -30,7 +30,7 @@ AppLoader_XCI::AppLoader_XCI(FileSys::VirtualFile file) return; std::tie(nacp_file, icon_file) = - FileSys::PatchManager(xci->GetProgramTitleID()).ParseControlNCA(control_nca); + FileSys::PatchManager(xci->GetProgramTitleID()).ParseControlNCA(*control_nca); } AppLoader_XCI::~AppLoader_XCI() = default; diff --git a/src/core/loader/xci.h b/src/core/loader/xci.h index 770ed1437..46f8dfc9e 100644 --- a/src/core/loader/xci.h +++ b/src/core/loader/xci.h @@ -49,7 +49,7 @@ private: std::unique_ptr<AppLoader_NCA> nca_loader; FileSys::VirtualFile icon_file; - std::shared_ptr<FileSys::NACP> nacp_file; + std::unique_ptr<FileSys::NACP> nacp_file; }; } // namespace Loader |