Desktop: Fixes laurent22#11975: Regression: Restarting app is broken

laurent22 · laurent22 · commit a6079869bc88 · 2025-03-21T23:26:54.000+01:00
diff --git a/packages/app-desktop/ElectronAppWrapper.ts b/packages/app-desktop/ElectronAppWrapper.ts
@@ -632,6 +632,9 @@ export default class ElectronAppWrapper {
 					}
 
 					if (callingAppGone) {
+						// Wait a bit more because even if the app is not responding, the process
+						// might still be there for a short while.
+						await msleep(1000);
 						this.ipcLogger_.warn('restartAltInstance: App is gone - restarting it');
 						void bridge().launchNewAppInstance(this.env());
 					} else {
diff --git a/packages/app-desktop/bridge.ts b/packages/app-desktop/bridge.ts
@@ -572,7 +572,7 @@ export class Bridge {
 			app.relaunch();
 		}
 
-		app.exit();
+		this.electronApp().exit();
 	}
 
 	public createImageFromPath(path: string) {

Original file line number	Diff line number	Diff line change
`@@ -632,6 +632,9 @@ export default class ElectronAppWrapper {`
`632`	`632`	`}`
`633`	`633`
`634`	`634`	`if (callingAppGone) {`
	`635`	`+ // Wait a bit more because even if the app is not responding, the process`
	`636`	`+ // might still be there for a short while.`
	`637`	`+ await msleep(1000);`
`635`	`638`	`this.ipcLogger_.warn('restartAltInstance: App is gone - restarting it');`
`636`	`639`	`void bridge().launchNewAppInstance(this.env());`
`637`	`640`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -572,7 +572,7 @@ export class Bridge {`
`572`	`572`	`app.relaunch();`
`573`	`573`	`}`
`574`	`574`
`575`		`- app.exit();`
	`575`	`+ this.electronApp().exit();`
`576`	`576`	`}`
`577`	`577`
`578`	`578`	`public createImageFromPath(path: string) {`