From b7c876bbe559122ce369a2b50fd19b13a3291bcb Mon Sep 17 00:00:00 2001 From: TGS963 Date: Sun, 27 Aug 2023 21:41:01 +0530 Subject: [PATCH] fixed overwrite setting not being read --- electron/index.ts | 10 +--------- renderer/components/settings-tab/ToggleOverwrite.tsx | 2 +- renderer/pages/index.tsx | 1 + 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/electron/index.ts b/electron/index.ts index 917d232..47dece9 100644 --- a/electron/index.ts +++ b/electron/index.ts @@ -164,15 +164,6 @@ app.on("ready", async () => { quality = parseInt(overwriteToggle); } }); - // GET OVERWRITE SETTINGS FROM LOCAL STORAGE - mainWindow.webContents - .executeJavaScript('localStorage.getItem("overwrite");', true) - .then((lastSavedOverwrite: boolean | null) => { - if (lastSavedOverwrite !== null) { - overwrite = lastSavedOverwrite; - } - }); - mainWindow.webContents.send(commands.OS, getPlatform()); }); @@ -379,6 +370,7 @@ ipcMain.handle(commands.SELECT_CUSTOM_MODEL_FOLDER, async (event, message) => { //------------------------Image Upscayl-----------------------------// ipcMain.on(commands.UPSCAYL, async (event, payload) => { if (!mainWindow) return; + overwrite = payload.overwrite; const model = payload.model as string; const gpuId = payload.gpuId as string; const saveImageAs = payload.saveImageAs as string; diff --git a/renderer/components/settings-tab/ToggleOverwrite.tsx b/renderer/components/settings-tab/ToggleOverwrite.tsx index e62b785..f1cfb07 100644 --- a/renderer/components/settings-tab/ToggleOverwrite.tsx +++ b/renderer/components/settings-tab/ToggleOverwrite.tsx @@ -10,7 +10,7 @@ const ToggleOverwrite = ({ overwrite, setOverwrite }: ToggleOverwriteProps) => { if (!localStorage.getItem("overwrite")) { localStorage.setItem("overwrite", JSON.stringify(overwrite)); } else { - setOverwrite(localStorage.getItem("overwrite")); + setOverwrite(localStorage.getItem("overwrite") === 'true'); } }, []); return ( diff --git a/renderer/pages/index.tsx b/renderer/pages/index.tsx index 682e2ef..e595b94 100644 --- a/renderer/pages/index.tsx +++ b/renderer/pages/index.tsx @@ -407,6 +407,7 @@ const Home = () => { gpuId: gpuId.length === 0 ? null : gpuId, saveImageAs, scale, + overwrite, }); logit("🏁 UPSCAYL"); }