瀏覽代碼

core/web_browser: Allow WebApplet to exit gracefully when an error occurs

Currently, yuzu just freezes when an error occurs while Initializing the WebApplet.
From a user perspective, this obviously isn't great as the game just softlocks.
With this change, yuzu will call the Finalize method, so to the game it seems like as the user just exited the WebApplet normally.

This works around https://github.com/yuzu-emu/yuzu/issues/2852.
FearlessTobi 6 年之前
父節點
當前提交
977418c65b
共有 1 個文件被更改,包括 6 次插入0 次删除
  1. 6 0
      src/core/hle/service/am/applets/web_browser.cpp

+ 6 - 0
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;
     }