Fix un installer issue
While install a x64 version, it should remove x86 version if it exists (and vice versa). The removal feature doesn't work though user answer Yes for the deletion. This commit fixes this issue.
This commit is contained in:
parent
d7f64d2027
commit
1c191ee146
@ -91,24 +91,6 @@ page Custom ExtraOptions
|
|||||||
|
|
||||||
!include "nsisInclude\mainSectionFuncs.nsh"
|
!include "nsisInclude\mainSectionFuncs.nsh"
|
||||||
|
|
||||||
Section -"Notepad++" mainSection
|
|
||||||
|
|
||||||
Call setPathAndOptions
|
|
||||||
|
|
||||||
${If} $diffArchDir2Remove != ""
|
|
||||||
!insertmacro uninstallRegKey
|
|
||||||
!insertmacro uninstallDir $diffArchDir2Remove
|
|
||||||
${endIf}
|
|
||||||
|
|
||||||
Call copyCommonFiles
|
|
||||||
|
|
||||||
Call removeUnstablePlugins
|
|
||||||
|
|
||||||
Call removeOldContextMenu
|
|
||||||
|
|
||||||
Call shortcutLinkManagement
|
|
||||||
|
|
||||||
SectionEnd
|
|
||||||
|
|
||||||
!include "nsisInclude\langs4Npp.nsh"
|
!include "nsisInclude\langs4Npp.nsh"
|
||||||
!include "nsisInclude\autoCompletion.nsh"
|
!include "nsisInclude\autoCompletion.nsh"
|
||||||
@ -212,11 +194,32 @@ noDelete64:
|
|||||||
|
|
||||||
FunctionEnd
|
FunctionEnd
|
||||||
|
|
||||||
|
|
||||||
|
Section -"Notepad++" mainSection
|
||||||
|
|
||||||
|
Call setPathAndOptions
|
||||||
|
|
||||||
|
${If} $diffArchDir2Remove != ""
|
||||||
|
!insertmacro uninstallRegKey
|
||||||
|
!insertmacro uninstallDir $diffArchDir2Remove
|
||||||
|
${endIf}
|
||||||
|
|
||||||
|
Call copyCommonFiles
|
||||||
|
|
||||||
|
Call removeUnstablePlugins
|
||||||
|
|
||||||
|
Call removeOldContextMenu
|
||||||
|
|
||||||
|
Call shortcutLinkManagement
|
||||||
|
|
||||||
|
SectionEnd
|
||||||
|
|
||||||
|
|
||||||
Function .onInstSuccess
|
Function .onInstSuccess
|
||||||
${MementoSectionSave}
|
${MementoSectionSave}
|
||||||
FunctionEnd
|
FunctionEnd
|
||||||
|
|
||||||
|
|
||||||
BrandingText "Don HO"
|
BrandingText "Je code donc je suis"
|
||||||
|
|
||||||
; eof
|
; eof
|
||||||
|
Loading…
Reference in New Issue
Block a user