[vlc-commits] nsis: restore the previous components on x64 (fix #10122)

[Ludovic Fauvet]

vlc | branch: master | Ludovic Fauvet <etix at videolan.org> | Fri Dec 13 16:38:01 2013 +0100| [ed67b5a08e13b795faa30aa51939c548f63a6cda] | committer: Ludovic Fauvet

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

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ed67b5a08e13b795faa30aa51939c548f63a6cda
---

 extras/package/win32/NSIS/vlc.win32.nsi.in |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/extras/package/win32/NSIS/vlc.win32.nsi.in b/extras/package/win32/NSIS/vlc.win32.nsi.in
index 0a113e7..d60c8e6 100644
--- 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
 
+ at HAVE_WIN64_TRUE@ SetRegView 64
+
 ${MementoSectionRestore}
 
 @HAVE_WIN64_TRUE@ !include "x64.nsh"
@@ -440,7 +442,6 @@ ${Else}
     Goto WinTooOld
 ${Endif}
 
- at HAVE_WIN64_TRUE@ SetRegView 64
 ReadRegStr $INSTDIR HKLM "${PRODUCT_DIR_REGKEY}" "InstallDir"
 StrCmp $INSTDIR "" 0 UAC_Elevate
 StrCpy $INSTDIR "$@PROGRAMFILES@\VideoLAN\VLC"