summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Zach Hilman2020-04-14 16:59:25 -0400
committerGravatar GitHub2020-04-14 16:59:25 -0400
commit8040f6d54430578e84ab60c2d219f23dfcf1862c (patch)
treea6bf38b200c5ef57971e6542c22944d7f34d2e59
parentMerge pull request #3636 from ReinUsesLisp/drop-vk-hpp (diff)
parentfile_sys: patch_manager: Return early when there are no layers to apply. (diff)
downloadyuzu-8040f6d54430578e84ab60c2d219f23dfcf1862c.tar.gz
yuzu-8040f6d54430578e84ab60c2d219f23dfcf1862c.tar.xz
yuzu-8040f6d54430578e84ab60c2d219f23dfcf1862c.zip
Merge pull request #3661 from bunnei/patch-manager-fix
file_sys: patch_manager: Return early when there are no layers to apply.
-rw-r--r--src/core/file_sys/patch_manager.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/core/file_sys/patch_manager.cpp b/src/core/file_sys/patch_manager.cpp
index e226e9711..e77e82b8d 100644
--- a/src/core/file_sys/patch_manager.cpp
+++ b/src/core/file_sys/patch_manager.cpp
@@ -348,6 +348,12 @@ static void ApplyLayeredFS(VirtualFile& romfs, u64 title_id, ContentRecordType t
348 if (ext_dir != nullptr) 348 if (ext_dir != nullptr)
349 layers_ext.push_back(std::move(ext_dir)); 349 layers_ext.push_back(std::move(ext_dir));
350 } 350 }
351
352 // When there are no layers to apply, return early as there is no need to rebuild the RomFS
353 if (layers.empty() && layers_ext.empty()) {
354 return;
355 }
356
351 layers.push_back(std::move(extracted)); 357 layers.push_back(std::move(extracted));
352 358
353 auto layered = LayeredVfsDirectory::MakeLayeredDirectory(std::move(layers)); 359 auto layered = LayeredVfsDirectory::MakeLayeredDirectory(std::move(layers));