geckon01/decky-loader
1
0
Fork 0
mirror of https://github.com/SteamDeckHomebrew/decky-loader.git synced 2026-07-11 13:01:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use a conditional while loop for when the scroll root is not found. (#212)

Browse Source 
* Changed back to a while loop for grabbing the scroll root\nAs recursive function exits before it hits 30 iterations in testing.

* Changed so if recursive limit is hit, it returns null instead of attempting to continue.

* Added log messages regarding recursion limits, as well as fixed recursion tracking.

* Removed errant return remaining from scroll root check.
This commit is contained in:
Devon Schneider
2022-10-08 07:35:21 -06:00
committed by GitHub
parent a3809222f9
commit 1fda74f160
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/tabs-hook.ts
+14 -8
View File
@@ -49,23 +49,29 @@ class TabsHook extends Logger {
let scrollRoot: any; let scrollRoot: any;
async function findScrollRoot(currentNode: any, iters: number): Promise<any> { async function findScrollRoot(currentNode: any, iters: number): Promise<any> {
if (iters >= 30) { if (iters >= 30) {
await sleep(5000); self.error(
return await findScrollRoot(tree, 0); 'Scroll root was not found before hitting the recursion limit, a developer will need to increase the limit.',
);
return null;
} }
currentNode = currentNode?.child; currentNode = currentNode?.child;
if (currentNode?.type?.prototype?.RemoveSmartScrollContainer) return currentNode; if (currentNode?.type?.prototype?.RemoveSmartScrollContainer) {
self.log(`Scroll root was found in ${iters} recursion cycles`);
return currentNode;
}
if (!currentNode) return null; if (!currentNode) return null;
if (currentNode.sibling) { if (currentNode.sibling) {
let node = await findScrollRoot(currentNode.sibling, iters++); let node = await findScrollRoot(currentNode.sibling, iters + 1);
if (node !== null) return node; if (node !== null) return node;
} }
return await findScrollRoot(currentNode, iters++); return await findScrollRoot(currentNode, iters + 1);
} }
(async () => { (async () => {
scrollRoot = await findScrollRoot(tree, 0); scrollRoot = await findScrollRoot(tree, 0);
if (!scrollRoot) { while (!scrollRoot) {
this.error('Failed to find scroll root node!'); this.log('Failed to find scroll root node, reattempting in 5 seconds');
return; await sleep(5000);
scrollRoot = await findScrollRoot(tree, 0);
} }
let newQA: any; let newQA: any;
let newQATabRenderer: any; let newQATabRenderer: any;