From aaa7612293b32f21e58c330daff1eb459f8960ba Mon Sep 17 00:00:00 2001
From: redphx <96280+redphx@users.noreply.github.com>
Date: Thu, 1 Feb 2024 20:22:18 +0700
Subject: [PATCH] Fix default touch control not showing sometimes

---
 better-xcloud.user.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/better-xcloud.user.js b/better-xcloud.user.js
index 126266d..0e164b1 100644
--- a/better-xcloud.user.js
+++ b/better-xcloud.user.js
@@ -3489,11 +3489,7 @@ class TouchController {
             url += `${xboxTitleId}.json`;
         }
         NATIVE_FETCH(url)
-            .then(resp => resp.json(), () => {
-                    TouchController.#customLayouts[xboxTitleId] = null;
-                    // Wait for BX_EXPOSED.touch_layout_manager
-                    setTimeout(() => dispatchLayouts(null), 1000);
-                })
+            .then(resp => resp.json())
             .then(json => {
                     // Normalize data
                     const schema_version = json.schema_version || 1;
@@ -3515,6 +3511,11 @@ class TouchController {
 
                     // Wait for BX_EXPOSED.touch_layout_manager
                     setTimeout(() => dispatchLayouts(json), 1000);
+                })
+            .catch(() => {
+                    TouchController.#customLayouts[xboxTitleId] = null;
+                    // Wait for BX_EXPOSED.touch_layout_manager
+                    setTimeout(() => dispatchLayouts(null), 1000);
                 });
     }