Skip to content

Commit 5c9ecc6

Browse files
committed
Fix installer 32-bits regression with wrong displayed installed version
Fix https://community.notepad-plus-plus.org/topic/27531/notepad-release-8.9.5/4?_=1778972557613 Close notepad-plus-plus#18046
1 parent c82d30a commit 5c9ecc6

1 file changed

Lines changed: 4 additions & 5 deletions

File tree

PowerEditor/installer/nppSetup.nsi

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,10 @@ relaunchNppDone:
256256
!ifdef ARCH64 || ARCHARM64 ; x64 or ARM64 : installation of 64 bits Notepad++ & its 64 bits components
257257
StrCpy $winSysDir $WINDIR\System32
258258
${If} ${RunningX64} ; Windows 64 bits
259-
; disable registry redirection (enable access to 64-bit portion of registry)
259+
; By default, regView value is 32.
260+
; But while installing Notepad++ x64 on 64-bits OS,
261+
; we disable registry redirection (enable access to 64-bit portion of registry)
262+
; regView value is set to 64 once for all.
260263
SetRegView 64
261264

262265
; change to x64 install dir if needed
@@ -359,9 +362,6 @@ ${MementoSection} "Context Menu Entry" explorerContextMenu
359362
${EndIf}
360363
!endif
361364

362-
; Write registry entries directly instead of using regsvr32
363-
SetRegView 64
364-
365365
; Shell context menu entry
366366
WriteRegStr HKCR "*\shell\ANotepad++64" "" "Notepad++ Context menu"
367367
WriteRegStr HKCR "*\shell\ANotepad++64" "ExplorerCommandHandler" "{B298D29A-A6ED-11DE-BA8C-A68E55D89593}"
@@ -381,7 +381,6 @@ ${MementoSection} "Context Menu Entry" explorerContextMenu
381381
!else ; 32 bits installer
382382
${If} ${RunningX64} ; running in Windows 64 bits
383383
Call RegisterMSIX
384-
SetRegView 32
385384
${EndIf}
386385
!endif
387386

0 commit comments

Comments
 (0)