summaryrefslogtreecommitdiffstats
path: root/src/core/hle/service
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2020-03-22 18:11:02 +0100
committerGitHub <noreply@github.com>2020-03-22 18:11:02 +0100
commite731c4b991a675c1e6dfd2a8511e84d3f739fa88 (patch)
treed9efca2350393bdb913a3db92e467dfe286eb812 /src/core/hle/service
parentMerge pull request #3531 from makigumo/yuzu_master (diff)
parentcore/web_browser: Allow WebApplet to exit gracefully when an error occurs (diff)
downloadyuzu-e731c4b991a675c1e6dfd2a8511e84d3f739fa88.tar
yuzu-e731c4b991a675c1e6dfd2a8511e84d3f739fa88.tar.gz
yuzu-e731c4b991a675c1e6dfd2a8511e84d3f739fa88.tar.bz2
yuzu-e731c4b991a675c1e6dfd2a8511e84d3f739fa88.tar.lz
yuzu-e731c4b991a675c1e6dfd2a8511e84d3f739fa88.tar.xz
yuzu-e731c4b991a675c1e6dfd2a8511e84d3f739fa88.tar.zst
yuzu-e731c4b991a675c1e6dfd2a8511e84d3f739fa88.zip
Diffstat (limited to 'src/core/hle/service')
-rw-r--r--src/core/hle/service/am/applets/web_browser.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/core/hle/service/am/applets/web_browser.cpp b/src/core/hle/service/am/applets/web_browser.cpp
index 12443c910..9f30e167d 100644
--- a/src/core/hle/service/am/applets/web_browser.cpp
+++ b/src/core/hle/service/am/applets/web_browser.cpp
@@ -254,6 +254,12 @@ void WebBrowser::Execute() {
if (status != RESULT_SUCCESS) {
complete = true;
+
+ // This is a workaround in order not to softlock yuzu when an error happens during the
+ // webapplet init. In order to avoid an svcBreak, the status is set to RESULT_SUCCESS
+ Finalize();
+ status = RESULT_SUCCESS;
+
return;
}