diff options
Diffstat (limited to 'extension')
| -rw-r--r-- | extension/react-app/src/pages/gui.tsx | 2 | ||||
| -rw-r--r-- | extension/src/activation/environmentSetup.ts | 19 |
2 files changed, 20 insertions, 1 deletions
diff --git a/extension/react-app/src/pages/gui.tsx b/extension/react-app/src/pages/gui.tsx index 86cb4b9a..848fcddc 100644 --- a/extension/react-app/src/pages/gui.tsx +++ b/extension/react-app/src/pages/gui.tsx @@ -247,7 +247,7 @@ function GUI(props: GUIProps) { "mainTextEntryCounter", (currentCount + 1).toString() ); - if (currentCount === 25) { + if (currentCount === 40) { dispatch( setDialogMessage( <div className="text-center"> diff --git a/extension/src/activation/environmentSetup.ts b/extension/src/activation/environmentSetup.ts index 23c0d7de..2067f0fb 100644 --- a/extension/src/activation/environmentSetup.ts +++ b/extension/src/activation/environmentSetup.ts @@ -101,6 +101,25 @@ async function checkOrKillRunningServer(serverUrl: string): Promise<boolean> { } catch (e: any) { if (!e.message.includes("Process doesn't exist")) { console.log("Failed to kill old server:", e); + + // Try again, on Windows. This time with taskkill + if (os.platform() === "win32") { + try { + const exePath = path.join( + getExtensionUri().fsPath, + "server", + "exe", + "run.exe" + ); + + await runCommand(`taskkill /F /IM ${exePath}`); + } catch (e: any) { + console.log( + "Failed to kill old server second time on windows with taskkill:", + e + ); + } + } } } if (fs.existsSync(serverVersionPath())) { |