Skip to content

Commit 5f62077

Browse files
committed
Bug 1443682 - Hide the use of OptionalExtensions behind an ifdef. r=mhowell
MozReview-Commit-ID: 8jBeNuMlaYj --HG-- extra : transplant_source : Eb%C74%0D%AC%DDpb%EBK%83%8F9W%B7%80%87%97%E0
1 parent d9ca1fc commit 5f62077

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

toolkit/mozapps/installer/windows/nsis/common.nsh

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5099,12 +5099,14 @@
50995099
${ElevateUAC}
51005100
${EndIf}
51015101

5102-
ReadINIStr $R8 $R7 "Install" "OptionalExtensions"
5103-
${If} $R8 == "false"
5104-
StrCpy $InstallOptionalExtensions "0"
5105-
${Else}
5106-
StrCpy $InstallOptionalExtensions "1"
5107-
${EndIf}
5102+
!ifdef MOZ_OPTIONAL_EXTENSIONS
5103+
ReadINIStr $R8 $R7 "Install" "OptionalExtensions"
5104+
${If} $R8 == "false"
5105+
StrCpy $InstallOptionalExtensions "0"
5106+
${Else}
5107+
StrCpy $InstallOptionalExtensions "1"
5108+
${EndIf}
5109+
!endif
51085110

51095111
!ifndef NO_STARTMENU_DIR
51105112
ReadINIStr $R8 $R7 "Install" "StartMenuDirectoryName"

0 commit comments

Comments
 (0)