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@videolan.org>

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@videolan.org>
d2bd8e96 · Rafaël Carré · Jean-Baptiste Kempf · 1091da8e · d2bd8e96
Commit d2bd8e96 authored Jan 26, 2013 by Rafaël Carré Committed by Jean-Baptiste Kempf Jan 26, 2013
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

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

No files found.
--- 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}" ""
+ReadRegStr $INSTDIR HKLM "${PRODUCT_DIR_REGKEY}" "InstallDir"
-StrCmp $INSTDIR "" 0 +1
+StrCmp $INSTDIR "" 0 UAC_Elevate
 StrCpy $INSTDIR "$@PROGRAMFILES@\VideoLAN\VLC"
 UAC_Elevate: