From 2c2c80a26609b42c55fffdf02ed2c7c9dd6fb33f Mon Sep 17 00:00:00 2001
From: SinghRajenM <singh.rajen15@gmal.com>
Date: Fri, 4 Nov 2016 01:59:53 +0530
Subject: [PATCH] Remove 32bit shell dll from 64bit installer

Closes #2408
---
 .../nsisInclude/binariesComponents.nsh          | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/PowerEditor/installer/nsisInclude/binariesComponents.nsh b/PowerEditor/installer/nsisInclude/binariesComponents.nsh
index 1fe027000..8424ae6ea 100644
--- a/PowerEditor/installer/nsisInclude/binariesComponents.nsh
+++ b/PowerEditor/installer/nsisInclude/binariesComponents.nsh
@@ -29,11 +29,20 @@
 ${MementoSection} "Context Menu Entry" explorerContextMenu
 	SetOverwrite try
 	SetOutPath "$INSTDIR\"
-	${If} ${RunningX64}
+	
+	; There is no need to keep x86 NppShell_06.dll in 64 bit installer
+	; But in 32bit installer both the Dlls are required
+	; 	As user can install 32bit npp version on x64 bit machine, that time x64 bit NppShell is required.
+	
+	!ifdef ARCH64
 		File /oname=$INSTDIR\NppShell_06.dll "..\bin\NppShell64_06.dll"
-	${Else}
-		File "..\bin\NppShell_06.dll"
-	${EndIf}
+	!else
+		${If} ${RunningX64}
+			File /oname=$INSTDIR\NppShell_06.dll "..\bin\NppShell64_06.dll"
+		${Else}
+			File "..\bin\NppShell_06.dll"
+		${EndIf}
+	!endif
 	
 	Exec 'regsvr32 /s "$INSTDIR\NppShell_06.dll"'
 ${MementoSectionEnd}