changes(nsis): move pre hooks before kill app (#10271)

tauri-apps · Jul 15, 2024 · 9f0a5fc · 9f0a5fc
1 parent d1df6be
commit 9f0a5fc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/.changes/nsis-pre-hooks-timing.md b/.changes/nsis-pre-hooks-timing.md
@@ -0,0 +1,5 @@
+---
+"tauri-bundler": "patch:changes"
+---
+
+Make `NSIS_HOOK_PREINSTALL` and `NSIS_HOOK_PREUNINSTALL` run before `CheckIfAppIsRunning` (which checks if the app is running and asks the user if they want to kill the app)
diff --git a/tooling/bundler/src/bundle/windows/templates/installer.nsi b/tooling/bundler/src/bundle/windows/templates/installer.nsi
@@ -556,12 +556,12 @@ SectionEnd
 Section Install
   SetOutPath $INSTDIR
 
-  !insertmacro CheckIfAppIsRunning
-
   !ifmacrodef NSIS_HOOK_PREINSTALL
     !insertmacro NSIS_HOOK_PREINSTALL
   !endif
 
+  !insertmacro CheckIfAppIsRunning
+
   ; Copy main executable
   File "${MAINBINARYSRCPATH}"
 
@@ -683,12 +683,12 @@ FunctionEnd
 
 Section Uninstall
 
-  !insertmacro CheckIfAppIsRunning
-
   !ifmacrodef NSIS_HOOK_PREUNINSTALL
     !insertmacro NSIS_HOOK_PREUNINSTALL
   !endif
 
+  !insertmacro CheckIfAppIsRunning
+
   ; Delete the app directory and its content from disk
   ; Copy main executable
   Delete "$INSTDIR\${MAINBINARYNAME}.exe"