fix:(nsis): Fix custom finish page insertion (#5288)

electron-userland · Sep 17, 2020 · 36319d9 · 36319d9
1 parent f44206d
commit 36319d9
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/packages/app-builder-lib/templates/nsis/assistedInstaller.nsh b/packages/app-builder-lib/templates/nsis/assistedInstaller.nsh
@@ -5,19 +5,6 @@
 !endif
 
 !ifndef BUILD_UNINSTALLER
-  !ifndef HIDE_RUN_AFTER_FINISH
-    Function StartApp
-      ${if} ${isUpdated}
-        StrCpy $1 "--updated"
-      ${else}
-        StrCpy $1 ""
-      ${endif}
-      ${StdUtils.ExecShellAsUser} $0 "$launchLink" "open" "$1"
-    FunctionEnd
-
-    !define MUI_FINISHPAGE_RUN
-    !define MUI_FINISHPAGE_RUN_FUNCTION "StartApp"
-  !endif
 
   !ifmacrodef customWelcomePage
     !insertmacro customWelcomePage
@@ -62,6 +49,19 @@
   !ifmacrodef customFinishPage
     !insertmacro customFinishPage
   !else
+    !ifndef HIDE_RUN_AFTER_FINISH
+      Function StartApp
+        ${if} ${isUpdated}
+          StrCpy $1 "--updated"
+        ${else}
+          StrCpy $1 ""
+        ${endif}
+        ${StdUtils.ExecShellAsUser} $0 "$launchLink" "open" "$1"
+      FunctionEnd
+
+      !define MUI_FINISHPAGE_RUN
+      !define MUI_FINISHPAGE_RUN_FUNCTION "StartApp"
+    !endif
     !insertmacro MUI_PAGE_FINISH
   !endif
 !else