From c4d6731401d3b6dc111a74d086df28704473070d Mon Sep 17 00:00:00 2001
From: AAGaming <aa@mail.catvibers.me>
Date: Sat, 17 Sep 2022 23:23:51 -0400
Subject: fix updater for new installs, fix file picker patch, fix scrolling on
 patch notes, fix tasks dir

---
 .../src/components/modals/filepicker/index.tsx     |  5 ++--
 .../modals/filepicker/patches/library.ts           | 35 +++++++++++++++-------
 2 files changed, 28 insertions(+), 12 deletions(-)

(limited to 'frontend/src/components/modals/filepicker')

diff --git a/frontend/src/components/modals/filepicker/index.tsx b/frontend/src/components/modals/filepicker/index.tsx
index 0847bd14..dcf179a3 100644
--- a/frontend/src/components/modals/filepicker/index.tsx
+++ b/frontend/src/components/modals/filepicker/index.tsx
@@ -86,7 +86,8 @@ const FilePicker: FunctionComponent<FilePickerProps> = ({
           onClick={() => {
             const newPathArr = path.split('/');
             newPathArr.pop();
-            const newPath = newPathArr.join('/');
+            let newPath = newPathArr.join('/');
+            if (newPath == '') newPath = '/';
             setPath(newPath);
           }}
         >
@@ -113,7 +114,7 @@ const FilePicker: FunctionComponent<FilePickerProps> = ({
                 <DialogButton
                   style={{ borderRadius: 'unset', margin: '0', padding: '10px' }}
                   onClick={() => {
-                    const fullPath = `${path}/${file.name}`;
+                    const fullPath = `${path}${path.endsWith('/') ? '' : '/'}${file.name}`;
                     if (file.isdir) setPath(fullPath);
                     else {
                       onSubmit({ path: fullPath, realpath: file.realpath });
diff --git a/frontend/src/components/modals/filepicker/patches/library.ts b/frontend/src/components/modals/filepicker/patches/library.ts
index 7ba977a5..c9c7d53c 100644
--- a/frontend/src/components/modals/filepicker/patches/library.ts
+++ b/frontend/src/components/modals/filepicker/patches/library.ts
@@ -1,4 +1,4 @@
-import { Patch, replacePatch, sleep } from 'decky-frontend-lib';
+import { Patch, findModuleChild, replacePatch } from 'decky-frontend-lib';
 
 declare global {
   interface Window {
@@ -10,8 +10,7 @@ declare global {
 let patch: Patch;
 
 function rePatch() {
-  // If you patch anything on SteamClient within the first few seconds of the client having loaded it will get redefined for some reason, so repatch any of these changes that occur within the first minute of the client loading
-  patch?.unpatch();
+  // If you patch anything on SteamClient within the first few seconds of the client having loaded it will get redefined for some reason, so repatch any of these changes that occur within the first 20s of the last patch
   patch = replacePatch(window.SteamClient.Apps, 'PromptToChangeShortcut', async ([appid]: number[]) => {
     try {
       const details = window.appDetailsStore.GetAppDetails(appid);
@@ -30,13 +29,29 @@ function rePatch() {
   });
 }
 
+// TODO type and add to frontend-lib
+const History = findModuleChild((m) => {
+  if (typeof m !== 'object') return undefined;
+  for (let prop in m) {
+    if (m[prop]?.m_history) return m[prop].m_history;
+  }
+});
+
 export default async function libraryPatch() {
-  await sleep(10000);
-  rePatch();
-  await sleep(10000);
-  rePatch();
+  try {
+    rePatch();
+    const unlisten = History.listen(() => {
+      if (window.SteamClient.Apps.PromptToChangeShortcut !== patch.patchedFunction) {
+        rePatch();
+      }
+    });
 
-  return () => {
-    patch.unpatch();
-  };
+    return () => {
+      patch.unpatch();
+      unlisten();
+    };
+  } catch (e) {
+    console.error('Error patching library file picker', e);
+  }
+  return () => {};
 }
-- 
cgit v1.2.3