summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBeebles <102569435+beebls@users.noreply.github.com>2023-03-01 21:20:31 -0700
committerGitHub <noreply@github.com>2023-03-01 20:20:31 -0800
commit46abc5a2666a7b3006a12d87bf56a7a12c300732 (patch)
tree6a94f6fc82639a3f86dcbc4cafe50fb104538c80
parent88e1e9b869c677e31ed860b093dd58408cb80def (diff)
downloaddecky-loader-2.6.2.tar.gz
decky-loader-2.6.2.zip
Fix QAM And Toaster Injection for Mar 02 Beta (#388)v2.6.3-pre1v2.6.2
-rw-r--r--backend/updater.py4
-rw-r--r--frontend/src/tabs-hook.tsx2
-rw-r--r--frontend/src/toaster.tsx1
3 files changed, 4 insertions, 3 deletions
diff --git a/backend/updater.py b/backend/updater.py
index 020e8db4..31bd0591 100644
--- a/backend/updater.py
+++ b/backend/updater.py
@@ -108,10 +108,10 @@ class Updater:
logger.debug("determining release type to find, branch is %i" % selectedBranch)
if selectedBranch == 0:
logger.debug("release type: release")
- self.remoteVer = next(filter(lambda ver: ver["tag_name"].startswith("v") and not ver["prerelease"] and ver["tag_name"], remoteVersions), None)
+ self.remoteVer = next(filter(lambda ver: ver["tag_name"].startswith("v") and not ver["prerelease"] and not ver["tag_name"].find("-pre") > 0 and ver["tag_name"], remoteVersions), None)
elif selectedBranch == 1:
logger.debug("release type: pre-release")
- self.remoteVer = next(filter(lambda ver: ver["prerelease"] and ver["tag_name"].startswith("v") and ver["tag_name"].find("-pre"), remoteVersions), None)
+ self.remoteVer = next(filter(lambda ver:ver["tag_name"].startswith("v"), remoteVersions), None)
else:
logger.error("release type: NOT FOUND")
raise ValueError("no valid branch found")
diff --git a/frontend/src/tabs-hook.tsx b/frontend/src/tabs-hook.tsx
index 3498b1aa..08206c14 100644
--- a/frontend/src/tabs-hook.tsx
+++ b/frontend/src/tabs-hook.tsx
@@ -35,7 +35,7 @@ class TabsHook extends Logger {
const tree = (document.getElementById('root') as any)._reactRootContainer._internalRoot.current;
let qAMRoot: any;
const findQAMRoot = (currentNode: any, iters: number): any => {
- if (iters >= 55) {
+ if (iters >= 65) {
// currently 45
return null;
}
diff --git a/frontend/src/toaster.tsx b/frontend/src/toaster.tsx
index b636d7b3..7ef4a447 100644
--- a/frontend/src/toaster.tsx
+++ b/frontend/src/toaster.tsx
@@ -45,6 +45,7 @@ class Toaster extends Logger {
return null;
}
if (
+ currentNode?.memoizedProps?.className?.startsWith?.('gamepadtoasts_GamepadToastPlaceholder') ||
currentNode?.memoizedProps?.className?.startsWith?.('toastmanager_ToastPlaceholder') ||
currentNode?.memoizedProps?.className?.startsWith?.('toastmanager_ToastPopup')
) {