From 98cf8939564bb277f0e63f2c676d5c3ecfd236c4 Mon Sep 17 00:00:00 2001 From: redphx <96280+redphx@users.noreply.github.com> Date: Mon, 30 Sep 2024 17:18:40 +0700 Subject: [PATCH] Fix Settings dialog opening during gameplay --- dist/better-xcloud.user.js | 4 ++-- src/index.ts | 7 +++++-- src/modules/ui/header.ts | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dist/better-xcloud.user.js b/dist/better-xcloud.user.js index 4d63f19..5a5c0eb 100644 --- a/dist/better-xcloud.user.js +++ b/dist/better-xcloud.user.js @@ -7656,8 +7656,8 @@ window.addEventListener("popstate", onHistoryChanged); window.history.pushState = patchHistoryMethod("pushState"); window.history.replaceState = patchHistoryMethod("replaceState"); window.addEventListener(BxEvent.XCLOUD_SERVERS_UNAVAILABLE, (e) => { - STATES.supportedRegion = !1, window.setTimeout(HeaderSection.watchHeader, 2000), SettingsNavigationDialog.getInstance().show(); -}); + if (STATES.supportedRegion = !1, window.setTimeout(HeaderSection.watchHeader, 2000), document.querySelector("div[class^=UnsupportedMarketPage-module__container]")) SettingsNavigationDialog.getInstance().show(); +}, { once: !0 }); window.addEventListener(BxEvent.XCLOUD_SERVERS_READY, (e) => { STATES.isSignedIn = !0, window.setTimeout(HeaderSection.watchHeader, 2000); }); diff --git a/src/index.ts b/src/index.ts index 1286fd2..f229d5e 100644 --- a/src/index.ts +++ b/src/index.ts @@ -192,8 +192,11 @@ window.addEventListener(BxEvent.XCLOUD_SERVERS_UNAVAILABLE, e => { window.setTimeout(HeaderSection.watchHeader, 2000); // Open Settings dialog on Unsupported page - SettingsNavigationDialog.getInstance().show(); -}); + const $unsupportedPage = document.querySelector('div[class^=UnsupportedMarketPage-module__container]') as HTMLElement; + if ($unsupportedPage) { + SettingsNavigationDialog.getInstance().show(); + } +}, {once: true}); window.addEventListener(BxEvent.XCLOUD_SERVERS_READY, e => { STATES.isSignedIn = true; diff --git a/src/modules/ui/header.ts b/src/modules/ui/header.ts index 2085349..97f3a67 100644 --- a/src/modules/ui/header.ts +++ b/src/modules/ui/header.ts @@ -63,7 +63,7 @@ export class HeaderSection { static checkHeader() { let $target = document.querySelector('#PageContent div[class*=EdgewaterHeader-module__rightSectionSpacing]'); if (!$target) { - $target = document.querySelector("div[class^=UnsupportedMarketPage-module__buttons]"); + $target = document.querySelector('div[class^=UnsupportedMarketPage-module__buttons]'); } $target && HeaderSection.#injectSettingsButton($target as HTMLElement);