From 871350ae357de050a9588ff84b7b1b7539467234 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 16 Oct 2018 13:16:02 -0400 Subject: content_archive: Simpify assignment of bktr_base_romfs in the constructor std::move doesn't actually dereference the data, so it doesn't matter whether or not the type is null. --- src/core/file_sys/content_archive.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/core/file_sys/content_archive.cpp') diff --git a/src/core/file_sys/content_archive.cpp b/src/core/file_sys/content_archive.cpp index 6ce1cb0ae..6c356d85d 100644 --- a/src/core/file_sys/content_archive.cpp +++ b/src/core/file_sys/content_archive.cpp @@ -103,8 +103,7 @@ static bool IsValidNCA(const NCAHeader& header) { } NCA::NCA(VirtualFile file_, VirtualFile bktr_base_romfs_, u64 bktr_base_ivfc_offset) - : file(std::move(file_)), - bktr_base_romfs(bktr_base_romfs_ ? std::move(bktr_base_romfs_) : nullptr) { + : file(std::move(file_)), bktr_base_romfs(std::move(bktr_base_romfs_)) { if (file == nullptr) { status = Loader::ResultStatus::ErrorNullFile; return; -- cgit v1.2.3