nsis: restore the previous components on x64 (fix #10122)

ed67b5a0 · Ludovic Fauvet · 0afac74a · ed67b5a0
Commit ed67b5a0 authored Dec 13, 2013 by Ludovic Fauvet
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

extras/package/win32/NSIS/vlc.win32.nsi.in extras/package/win32/NSIS/vlc.win32.nsi.in +2 -1

No files found.
--- a/extras/package/win32/NSIS/vlc.win32.nsi.in
+++ b/extras/package/win32/NSIS/vlc.win32.nsi.in
@@ -424,6 +424,8 @@ ${MementoSectionDone}
 ;;; Start function
 Function .onInit

+@HAVE_WIN64_TRUE@ SetRegView 64
+
 ${MementoSectionRestore}

 @HAVE_WIN64_TRUE@ !include "x64.nsh"
@@ -440,7 +442,6 @@ ${Else}
    Goto WinTooOld
 ${Endif}

-@HAVE_WIN64_TRUE@ SetRegView 64
 ReadRegStr $INSTDIR HKLM "${PRODUCT_DIR_REGKEY}" "InstallDir"
 StrCmp $INSTDIR "" 0 UAC_Elevate
 StrCpy $INSTDIR "$@PROGRAMFILES@\VideoLAN\VLC"