From ba27104be6c33984a9ccd680b7334c91e73340fd Mon Sep 17 00:00:00 2001
From: smartfrigde <37928912+smartfrigde@users.noreply.github.com>
Date: Mon, 3 Jul 2023 13:25:26 +0200
Subject: [PATCH] Fix setup not starting up

---
 src/main.ts          | 8 ++++++++
 src/setup/setup.html | 4 +++-
 src/utils.ts         | 4 +++-
 src/window.ts        | 2 --
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/main.ts b/src/main.ts
index bd3d116..558a459 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -5,11 +5,14 @@ import {
     Settings,
     checkForDataFolder,
     checkIfConfigExists,
+    firstRun,
     getConfig,
     injectElectronFlags,
     installModLoader,
     modInstallState,
     setConfig,
+    setLang,
+    setWindowState,
     sleep
 } from "./utils";
 import "./extensions/mods";
@@ -18,6 +21,7 @@ import {createCustomWindow, createNativeWindow, createTransparentWindow, mainWin
 import path from "path";
 import {createTManagerWindow} from "./themeManager/main";
 import {createSplashWindow} from "./splash/main";
+import {createSetupWindow} from "./setup/main";
 export let iconPath: string;
 export let settings: any;
 export let customTitlebar: boolean;
@@ -93,6 +97,10 @@ if (!app.requestSingleInstanceLock()) {
             if ((await getConfig("skipSplash")) == false) {
                 createSplashWindow();
             }
+            if (firstRun == true) {
+                await setLang(new Intl.DateTimeFormat().resolvedOptions().locale);
+                createSetupWindow();
+            }
             switch (await getConfig("windowStyle")) {
                 case "default":
                     createCustomWindow();
diff --git a/src/setup/setup.html b/src/setup/setup.html
index 1c9917b..4394fa1 100644
--- a/src/setup/setup.html
+++ b/src/setup/setup.html
@@ -136,6 +136,7 @@
                         automaticPatches: false,
                         mobileMode: false,
                         spellcheck: true,
+                        skipSplash: false,
                         disableAutogain: false,
                         mods: options.mod,
                         dynamicIcon: false,
@@ -145,7 +146,8 @@
                         alternativePaste: false,
                         performanceMode: "none",
                         trayIcon: "default",
-                        inviteWebsocket: true
+                        inviteWebsocket: true,
+                        doneSetup: true
                     });
                     setTimeout(() => window.armcordinternal.restart(), 500);
                 });
diff --git a/src/utils.ts b/src/utils.ts
index ab5bb88..fa821aa 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -222,9 +222,11 @@ export async function getWindowState<K extends keyof WindowState>(object: K): Pr
     const userDataPath = app.getPath("userData");
     const storagePath = path.join(userDataPath, "/storage/");
     const settingsFile = `${storagePath}window.json`;
+    if (!fs.existsSync(settingsFile)) {
+        fs.writeFileSync(settingsFile, "{}", "utf-8");
+    }
     let rawdata = fs.readFileSync(settingsFile, "utf-8");
     let returndata = JSON.parse(rawdata);
-    console.log(returndata);
     console.log(`[Window state manager] ${returndata}`);
     return returndata[object];
 }
diff --git a/src/window.ts b/src/window.ts
index caf222f..58088dc 100644
--- a/src/window.ts
+++ b/src/window.ts
@@ -261,8 +261,6 @@ async function doAfterDefiningTheWindow(): Promise<void> {
         //await startServer();
     }
     if (firstRun) {
-        await setLang(new Intl.DateTimeFormat().resolvedOptions().locale);
-        createSetupWindow();
         mainWindow.close();
     }
     mainWindow.loadURL("data:text/html,%3Ch1%3ELoading%21%3C%2Fh1%3E");