fixed windows uninstaller

2 years ago · 20bc254a42
parent e298d5fbd8
commit 20bc254a42
4 changed files with 4 additions and 3 deletions
--- a/package/nsis/check-running.nsh
+++ b/package/nsis/check-running.nsh
@ -1,5 +1,4 @@
 !macro EnsureAppIsNotRunning
-  Var /GLOBAL retryNumEnsureAppIsNotRunning
  ${For} $retryNumEnsureAppIsNotRunning 0 1000
    DetailPrint "Checking if ${PRODUCT_EXE} is running..."
    nsExec::ExecToStack /OEM 'tasklist /NH /FI "IMAGENAME eq ${PRODUCT_EXE}"'
--- a/package/nsis/main-un.nsi
+++ b/package/nsis/main-un.nsi
@ -1,4 +1,5 @@
 !include package\nsis\defines.nsh
+!include package\nsis\variables.nsh
 !include package\nsis\includes.nsh
 !include package\nsis\check-running.nsh

--- a/package/nsis/main.nsi
+++ b/package/nsis/main.nsi
@ -1,4 +1,5 @@
 !include package\nsis\defines.nsh
+!include package\nsis\variables.nsh
 !include package\nsis\includes.nsh
 !include package\nsis\check-running.nsh

@ -22,8 +23,6 @@

 !insertmacro MUI_LANGUAGE "English"

-Var /GLOBAL isUpdaterMode
-
 Function .onInit
  ${GetOptions} $CMDLINE "/U" $isUpdaterMode

--- a/package/nsis/variables.nsh
+++ b/package/nsis/variables.nsh
@ -0,0 +1,2 @@
+Var /GLOBAL isUpdaterMode
+Var /GLOBAL retryNumEnsureAppIsNotRunning