From b3c49cb4612210f5e2f48a0ef2f22d93b0c8a7d2 Mon Sep 17 00:00:00 2001
From: develar <develar@gmail.com>
Date: Fri, 5 Aug 2016 08:36:13 +0200
Subject: [PATCH] =?UTF-8?q?fix:=20one-click=20installer=20=E2=80=94=20Unin?=
 =?UTF-8?q?stall=20Confirm=20Dialog=20Option=20for=20One-click=20Windows?=
 =?UTF-8?q?=20NSIS=20#618?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/nsis/installer.nsi | 8 +++++---
 templates/nsis/oneClick.nsh  | 1 -
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/templates/nsis/installer.nsi b/templates/nsis/installer.nsi
index d431f3bf9e8..73af96095e4 100644
--- 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
index 21754a4f9b4..387457595aa 100644
--- 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