electron: Fix path comparison for exit confirmation (#10597)

eclipse-theia · Jan 10, 2022 · 52a6529 · 52a6529
1 parent e0359d4
commit 52a6529
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/packages/core/src/electron-main/electron-main-application.ts b/packages/core/src/electron-main/electron-main-application.ts
@@ -487,7 +487,14 @@ export class ElectronMainApplication {
 
     protected async handleStopRequest(electronWindow: BrowserWindow, onSafeCallback: () => unknown, reason: StopReason): Promise<void> {
         // Only confirm close to windows that have loaded our front end.
-        const safeToClose = !electronWindow.webContents.getURL().includes(this.globals.THEIA_FRONTEND_HTML_PATH) || await this.checkSafeToStop(electronWindow, reason);
+        let currentUrl = electronWindow.webContents.getURL();
+        let frontendUri = this.globals.THEIA_FRONTEND_HTML_PATH;
+        // Since our resolved frontend HTML path might contain backward slashes on Windows, we normalize everything first.
+        if (isWindows) {
+            currentUrl = currentUrl.replace(/\\/g, '/');
+            frontendUri = frontendUri.replace(/\\/g, '/');
+        }
+        const safeToClose = !currentUrl.includes(frontendUri) || await this.checkSafeToStop(electronWindow, reason);
         if (safeToClose) {
             onSafeCallback();
         }