Crash_Override
/
FreeDATA
mirror of https://github.com/DJ2LS/FreeDATA
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed copy and paste error

This commit is contained in:
DJ2LS 2024-03-02 11:38:09 +01:00
parent bab8aad126
commit 34dcdd5d8a
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
gui/electron/main/index.ts
View File

@ -73,9 +73,9 @@ async function createWindow() {
}
// Test actively push message to the Electron-Renderer
win.webContents.on("did-finish-load", () => {
win?.webContents.send("main-process-message", new Date().toLocaleString());
});
//win.webContents.on("did-finish-load", () => {
// win?.webContents.send("main-process-message", new Date().toLocaleString());
//});
// Make all links open with the browser, not with the application
win.webContents.setWindowOpenHandler(({ url }) => {
@ -196,13 +196,26 @@ function close_sub_processes() {
if (serverProcess != null) {
try {
console.log(`Killing server process with PID: ${serverProcess.pid}`);
// For Windows, use taskkill to ensure all child processes are also terminated
if (isWindows) {
spawn("taskkill", ["/pid", serverProcess.pid.toString(), "/f", "/t"]);
} else {
// On macOS and Linux, sending SIGTERM should suffice
process.kill(serverProcess.pid);
}
switch (platform().toLowerCase()) {
//case "darwin":
// process.kill(serverProcess.pid);
// break;
//case "linux":
// process.kill(serverProcess.pid);
// break;
case "win32":
// For Windows, use taskkill to ensure all child processes are also terminated
spawn("taskkill", ["/pid", serverProcess.pid.toString(), "/f", "/t"]);
break;
default:
console.log("Unhandled OS Platform: ", platform());
serverProcess = null;
serverPath = null;
break;
}
} catch (error) {
console.error(`Error killing server process: ${error}`);
}