From d5e297c6837321ce2bc3c1bdd5a1ab46d41aa3bc Mon Sep 17 00:00:00 2001
From: OmegaRogue <omegarogue@omegavoid.codes>
Date: Sat, 10 Feb 2024 15:52:03 +0100
Subject: [PATCH 1/2] :bug: Fix global games not being loaded

---
 config.json | 3 +--
 src/main.ts | 5 +++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config.json b/config.json
index 860320f..eb9300a 100644
--- a/config.json
+++ b/config.json
@@ -4,6 +4,5 @@
   "backgroundColor": "#003049ff",
   "textColor": "#eae2b7ff",
   "accentColor": "#f77f00ff",
-  "ignoreCertificateErrors": false,
-  "experimentalMultiInstance": false
+  "ignoreCertificateErrors": false
 }
\ No newline at end of file
diff --git a/src/main.ts b/src/main.ts
index 5493e0a..338eeb3 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -214,7 +214,7 @@ function createWindow(): BrowserWindow {
     });
 
     window.once('ready-to-show', () => {
-        window.maximize();
+        // window.maximize();
         window.show();
     });
     window.on('closed', () => {
@@ -245,9 +245,10 @@ ipcMain.handle("app-version", () => app.getVersion())
 function getAppConfig(): AppConfig {
     try {
         const json = fs.readFileSync(path.join(app.getAppPath(), "config.json")).toString();
+        console.log(json);
         let appConfig = JSON.parse(json) as AppConfig;
         const userData = getUserData();
-        appConfig = {...appConfig, ...userData.app};
+        appConfig = {...appConfig, ...userData.app, games: [...appConfig.games, ...userData.app.games]};
         if (appConfig.ignoreCertificateErrors) {
             app.commandLine.appendSwitch("ignore-certificate-errors");
         }

From 86a16f63afc6ea82f0686619faba76216ce7e3b6 Mon Sep 17 00:00:00 2001
From: OmegaRogue <omegarogue@omegavoid.codes>
Date: Sat, 10 Feb 2024 15:56:02 +0100
Subject: [PATCH 2/2] :ambulance: Remove code for local testing

---
 src/main.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.ts b/src/main.ts
index 338eeb3..a175258 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -214,7 +214,7 @@ function createWindow(): BrowserWindow {
     });
 
     window.once('ready-to-show', () => {
-        // window.maximize();
+        window.maximize();
         window.show();
     });
     window.on('closed', () => {