summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorph <39850852+Morph1984@users.noreply.github.com>2021-10-11 08:09:42 +0200
committerGitHub <noreply@github.com>2021-10-11 08:09:42 +0200
commit97452b95588ef9eb75453a5333e8a4d7471c8328 (patch)
treefa5ac367a5385de49a4c92cb79c427a0a5d4b151
parentMerge pull request #7152 from v1993/patch-6 (diff)
parentapplets/web: Fallback to loader to get the manual romfs if none is found (diff)
downloadyuzu-97452b95588ef9eb75453a5333e8a4d7471c8328.tar
yuzu-97452b95588ef9eb75453a5333e8a4d7471c8328.tar.gz
yuzu-97452b95588ef9eb75453a5333e8a4d7471c8328.tar.bz2
yuzu-97452b95588ef9eb75453a5333e8a4d7471c8328.tar.lz
yuzu-97452b95588ef9eb75453a5333e8a4d7471c8328.tar.xz
yuzu-97452b95588ef9eb75453a5333e8a4d7471c8328.tar.zst
yuzu-97452b95588ef9eb75453a5333e8a4d7471c8328.zip
-rw-r--r--src/core/hle/service/am/applets/applet_web_browser.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/core/hle/service/am/applets/applet_web_browser.cpp b/src/core/hle/service/am/applets/applet_web_browser.cpp
index 35f194961..927eeefff 100644
--- a/src/core/hle/service/am/applets/applet_web_browser.cpp
+++ b/src/core/hle/service/am/applets/applet_web_browser.cpp
@@ -24,6 +24,7 @@
#include "core/hle/service/am/applets/applet_web_browser.h"
#include "core/hle/service/filesystem/filesystem.h"
#include "core/hle/service/ns/pl_u.h"
+#include "core/loader/loader.h"
namespace Service::AM::Applets {
@@ -122,6 +123,15 @@ FileSys::VirtualFile GetOfflineRomFS(Core::System& system, u64 title_id,
const auto nca = system.GetContentProvider().GetEntry(title_id, nca_type);
if (nca == nullptr) {
+ if (nca_type == FileSys::ContentRecordType::HtmlDocument) {
+ LOG_WARNING(Service_AM, "Falling back to AppLoader to get the RomFS.");
+ FileSys::VirtualFile romfs;
+ system.GetAppLoader().ReadManualRomFS(romfs);
+ if (romfs != nullptr) {
+ return romfs;
+ }
+ }
+
LOG_ERROR(Service_AM,
"NCA of type={} with title_id={:016X} is not found in the ContentProvider!",
nca_type, title_id);