Skip to content

Commit fb9a1bd

Browse files
committed
Tweaked installer redist handling #3
1 parent eddc3b4 commit fb9a1bd

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

Shared/installer/nightly.nsi

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ Function .onInit
296296
StrCpy $ShowLastUsed "1"
297297
${EndIf}
298298
${EndIf}
299-
299+
300300
; Try to find previously saved GTA:SA install path
301301
ReadRegStr $2 HKLM "SOFTWARE\Multi Theft Auto: San Andreas All\Common" "GTA:SA Path"
302302
${If} $2 == ""
@@ -1259,11 +1259,13 @@ FunctionEnd
12591259
;----------------------------------------
12601260
; Out $0 = result ("1" = yes, "0" = no)
12611261
Function ShouldInstallVC14Redistributable
1262-
IfFileExists "$WINDIR\System32\api-ms-win-crt-runtime-*.dll" FileFound 0
1263-
${LogText} "api-ms-win-crt-runtime-*.dll not found"
1264-
StrCpy $0 "1"
1265-
Return
1266-
FileFound:
1262+
${If} ${AtMostWin7}
1263+
IfFileExists "$WINDIR\System32\api-ms-win-crt-runtime-*.dll" FileFound 0
1264+
${LogText} "api-ms-win-crt-runtime-*.dll not found"
1265+
StrCpy $0 "1"
1266+
Return
1267+
FileFound:
1268+
${EndIf}
12671269
Call IsVC14RedistributableInstalled
12681270
IntOp $0 $0 ^ 1
12691271
FunctionEnd

0 commit comments

Comments
 (0)