From 0b2d4c3803375d4e53e68e00b32e818a801ae0c4 Mon Sep 17 00:00:00 2001 From: meriadec Date: Fri, 29 Jun 2018 17:49:54 +0200 Subject: [PATCH] Let main process kill itself, kill only internal process on win close --- src/main/app.js | 4 +--- src/main/terminator.js | 3 --- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/main/app.js b/src/main/app.js index acd98db2..cab281b3 100644 --- a/src/main/app.js +++ b/src/main/app.js @@ -12,9 +12,7 @@ import { import menu from 'main/menu' import db from 'helpers/db' -import { setMainProcessPID, terminateAllTheThings } from './terminator' - -setMainProcessPID(process.pid) +import { terminateAllTheThings } from './terminator' // necessary to prevent win from being garbage collected let mainWindow = null diff --git a/src/main/terminator.js b/src/main/terminator.js index 8bc0f6cc..6c2a5835 100644 --- a/src/main/terminator.js +++ b/src/main/terminator.js @@ -15,7 +15,6 @@ // \ \ \ | | / / // \ \ \ / -let MAIN_PROCESS_PID: ?number = null let INTERNAL_PROCESS_PID: ?number = null function kill(processType, pid) { @@ -23,10 +22,8 @@ function kill(processType, pid) { process.kill(pid, 'SIGTERM') } -exports.setMainProcessPID = (pid: number) => (MAIN_PROCESS_PID = pid) exports.setInternalProcessPID = (pid: number) => (INTERNAL_PROCESS_PID = pid) exports.terminateAllTheThings = () => { if (INTERNAL_PROCESS_PID) kill('internal', INTERNAL_PROCESS_PID) - if (MAIN_PROCESS_PID) kill('main', MAIN_PROCESS_PID) }