Merge pull request #22 from OmegaRogue/pull-request-no-injection

theripper93 · Feb 10, 2024 · 7e6de91 · 7e6de91
2 parents 525a297 + ed7e15e
commit 7e6de91
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/main.ts b/src/main.ts
@@ -231,9 +231,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");
         }