[vlc-commits] Fix #6449

[Rafaël Carré]

vlc/vlc-2.0 | branch: master | Rafaël Carré <funman at videolan.org> | Sat Jan 26 16:25:49 2013 +0100| [d2bd8e961efa85a5365a6d9cbbd7679c8e084d59] | committer: Jean-Baptiste Kempf

Fix #6449

A relative jump of +1 is the same than 0, we need +2 to skip the next
instruction.
Use named label so it is more clear than +2.

Read the InstallDir regkey, "" points to vlc.exe
(cherry picked from commit b0c000c5883225d0edb4f268d967c77d07254dce)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 extras/package/win32/vlc.win32.nsi.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extras/package/win32/vlc.win32.nsi.in b/extras/package/win32/vlc.win32.nsi.in
index 2e61083..fda1d23 100644
--- a/extras/package/win32/vlc.win32.nsi.in
+++ b/extras/package/win32/vlc.win32.nsi.in
@@ -785,8 +785,8 @@ Function .onInit
 @HAVE_WIN64_TRUE@ ${Endif}
 
 @HAVE_WIN64_TRUE@ SetRegView 64
-ReadRegStr $INSTDIR HKLM "${PRODUCT_DIR_REGKEY}" ""
-StrCmp $INSTDIR "" 0 +1
+ReadRegStr $INSTDIR HKLM "${PRODUCT_DIR_REGKEY}" "InstallDir"
+StrCmp $INSTDIR "" 0 UAC_Elevate
 StrCpy $INSTDIR "$@PROGRAMFILES@\VideoLAN\VLC"
 
 UAC_Elevate: