Fixed closing app not always closing all threads

realitymod · Jan 13, 2022 · a11a539 · a11a539
1 parent 555ba66
commit a11a539
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 9 deletions.
diff --git a/app/cancel.js b/app/cancel.js
@@ -27,7 +27,6 @@ $(() => {
     }
 
     function onCloseButtonPress() {
-        app.quit();
         win.close();
     }
 
@@ -45,9 +44,7 @@ $(() => {
     }
 
     function onCancelButtonPress() {
-        app.quit();
         win.close();
-
     }
 
     function onCancelAndRemoveButtonPress() {
@@ -58,7 +55,6 @@ $(() => {
             console.log(err)
         }
         fs.unlinkSync(configPath);
-        app.quit();
         win.close();
     }
 

diff --git a/app/download.js b/app/download.js
@@ -89,7 +89,6 @@ $(() => {
     }
 
     function onCloseButtonPress() {
-        app.quit();
         win.close();
     }
 

diff --git a/app/folder_select.js b/app/folder_select.js
@@ -66,9 +66,7 @@ $(() => {
     }
 
     function onCloseButtonPress() {
-        app.quit();
         win.close();
-
     }
 
     function onContinueButtonPress() {

diff --git a/app/main.js b/app/main.js
@@ -43,6 +43,11 @@ function createWindow() {
 
 }
 
+// Quit when all windows are closed.
+app.on('window-all-closed', function() {
+    app.quit();
+})
+
 app.setAppUserModelId("PRBF2-Download-Assistant");
 app.on('ready', createWindow);
 

diff --git a/app/remove.js b/app/remove.js
@@ -27,7 +27,6 @@ $(() => {
     }
 
     function onCloseButtonPress() {
-        app.quit();
         win.close();
     }
 
@@ -52,7 +51,6 @@ $(() => {
             console.log(err)
         }
         fs.unlinkSync(configPath);
-        app.quit();
         win.close();
     }