Skip to content
Snippets Groups Projects
Commit 3e17a3c8 authored by Nat Goodspeed's avatar Nat Goodspeed
Browse files

SL-10506: Try again to attain desired behavior.

parent 1ff58087
No related branches found
No related tags found
No related merge requests found
...@@ -184,9 +184,20 @@ Function .onInit ...@@ -184,9 +184,20 @@ Function .onInit
%%ENGAGEREGISTRY%% %%ENGAGEREGISTRY%%
# Setting MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_KEY and # SL-10506: Setting MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_KEY and
# MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_VALUENAME should # MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_VALUENAME should
# read the current location of the install for this version into INSTDIR. # read the current location of the install for this version into INSTDIR.
# However, SL-10506 complains about the resulting behavior, so the logic below
# is adapted from before we introduced MultiUser.nsh.
# if $0 is empty, this is the first time for this viewer name
ReadRegStr $0 SHELL_CONTEXT "${INSTNAME_KEY}" ""
# viewer with this name was installed before
${If} $0 != ""
# use the value we got from registry as install location
StrCpy $INSTDIR $0
${EndIf}
Call CheckCPUFlags # Make sure we have SSE2 support Call CheckCPUFlags # Make sure we have SSE2 support
Call CheckWindowsVersion # Don't install On unsupported systems Call CheckWindowsVersion # Don't install On unsupported systems
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment