Merge pull request #545 from kinvolk/fix-windows-quit

app: Kill Headlamp server process synchronously

Merge pull request #545 from kinvolk/fix-windows-quit
app: Kill Headlamp server process synchronously
7ff36307 · René Dudfield · GitHub · 28cc01bd · d8bbf179 · 7ff36307
Unverified Commit 7ff36307 authored 2 years ago by René Dudfield Committed by GitHub 2 years ago
Hide whitespace changes
Inline Side-by-side

Showing

with 2 additions and 2 deletions
+2 -2
--- a/app/electron/main.ts
+++ b/app/electron/main.ts
-import { ChildProcessWithoutNullStreams, exec, spawn } from 'child_process';
+import { ChildProcessWithoutNullStreams, execSync, spawn } from 'child_process';
 import { app, BrowserWindow, ipcMain, Menu, MenuItem, screen, shell } from 'electron';
 import { IpcMainEvent, MenuItemConstructorOptions } from 'electron/main';
 import log from 'electron-log';
@@ -97,7 +97,7 @@ function quitServerProcess() {
    process.kill(-serverProcess.pid);
  } else if (process.platform === 'win32' && serverProcess) {
    // Otherwise on Windows the process will stick around.
-    exec('taskkill /pid ' + serverProcess.pid + ' /T /F');
+    execSync('taskkill /pid ' + serverProcess.pid + ' /T /F');
  }

  serverProcess.stdin.destroy();