Merge branch 'dev' into staging

wireapp · Jun 12, 2024 · eaf30f0 · eaf30f0
2 parents a8bd172 + c2a7f58
commit eaf30f0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/electron/src/runtime/lifecycle.ts b/electron/src/runtime/lifecycle.ts
@@ -54,7 +54,7 @@ export const checkSingleInstance = async () => {
     logger.info('Checking if we are the first instance ...', isFirstInstance);
 
     if (!EnvironmentUtil.platform.IS_WINDOWS && !isFirstInstance) {
-      await quit(false);
+      await quit();
     } else {
       app.on('second-instance', () => WindowManager.showPrimaryWindow());
     }
@@ -83,7 +83,7 @@ export const addRelaunchListeners = (listener: () => void) => {
   relaunchListeners.push(listener);
 };
 
-export const quit = async (clearCache = true): Promise<void> => {
+export const quit = async (clearCache = false): Promise<void> => {
   logger.info('Initiating app quit ...');
   settings.persistToFile();
 

diff --git a/electron/src/update/squirrel.ts b/electron/src/update/squirrel.ts
@@ -122,24 +122,26 @@ async function scheduleUpdate(): Promise<void> {
 
 export async function handleSquirrelArgs(): Promise<void> {
   const squirrelEvent = process.argv[1];
+  // See https://github.com/Squirrel/Squirrel.Windows/blob/develop/docs/using/custom-squirrel-events-non-cs.md
 
   switch (squirrelEvent) {
     case SQUIRREL_EVENT.INSTALL:
     case SQUIRREL_EVENT.UPDATED: {
       logger.info(`Creating shortcuts for exe ${exePath}...`);
       await createShortcuts(exePath);
-      await lifecycle.quit();
+      await lifecycle.quit(true);
       return;
     }
 
     case SQUIRREL_EVENT.UNINSTALL: {
       await removeShortcuts();
-      await lifecycle.quit();
+      await lifecycle.quit(true);
       return;
     }
 
     case SQUIRREL_EVENT.OBSOLETE: {
-      await lifecycle.quit();
+      // This is called when the app is updated but the old version is still running
+      await lifecycle.quit(true);
       return;
     }
   }