fix: one-click installer — Uninstall Confirm Dialog Option for One-cl…

…ick Windows NSIS #618
electron-userland · Aug 5, 2016 · b3c49cb · b3c49cb
1 parent d70e04e
commit b3c49cb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/templates/nsis/installer.nsi b/templates/nsis/installer.nsi
@@ -52,10 +52,12 @@ Function un.onInit
   !insertmacro check64BitAndSetRegView
 
   ${IfNot} ${Silent}
-    MessageBox MB_OKCANCEL "Are you sure you want to uninstall ${PRODUCT_NAME}?" IDOK next
-      Quit
+    MessageBox MB_OKCANCEL "Are you sure you want to uninstall ${PRODUCT_NAME}?" IDOK +2
+    Quit
 
-    next:
+    !ifdef ONE_CLICK
+      SetSilent silent
+    !endif
   ${EndIf}
 
   !insertmacro initMultiUser Un un.

diff --git a/templates/nsis/oneClick.nsh b/templates/nsis/oneClick.nsh
@@ -9,7 +9,6 @@
   FunctionEnd
 !endif
 
-SilentUnInstall silent
 AutoCloseWindow true
 !insertmacro MUI_PAGE_INSTFILES
 !insertmacro MUI_UNPAGE_INSTFILES