fix(nsis): should close app when Silent and ONE_CLICK

electron-userland · Jul 26, 2021 · a5c6e40 · SchoberServices · Nov 9, 2022 · a5c6e40
1 parent 58770bb
commit a5c6e40
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/packages/app-builder-lib/templates/nsis/uninstaller.nsh b/packages/app-builder-lib/templates/nsis/uninstaller.nsh
@@ -1,13 +1,19 @@
+Function un.checkAppRunning
+  !insertmacro CHECK_APP_RUNNING
+FunctionEnd
+
 Function un.onInit
   !insertmacro check64BitAndSetRegView
 
-  ${IfNot} ${Silent}
+  ${If} ${Silent}
+    call un.checkAppRunning
+  ${else}
     !ifdef ONE_CLICK
       MessageBox MB_OKCANCEL "$(areYouSureToUninstall)" IDOK +2
       Quit
 
       # one-click installer executes uninstall section in the silent mode, but we must show message dialog if silent mode was not explicitly set by user (using /S flag)
-      !insertmacro CHECK_APP_RUNNING
+      call un.checkAppRunning
       SetSilent silent
     !endif
   ${endIf}
@@ -20,9 +26,11 @@ Function un.onInit
 FunctionEnd
 
 Section "un.install"
+  # for assisted installer we check it here to show progress
   !ifndef ONE_CLICK
-    # for assisted installer we check it here to show progress
-    !insertmacro CHECK_APP_RUNNING
+    ${IfNot} ${Silent}
+      call un.checkAppRunning
+    ${endIf}
   !endif
 
   !insertmacro setLinkVars