From a0829e9a24274436319e67e88d472ea65aec8f2a Mon Sep 17 00:00:00 2001
From: lightningterror <18107717+lightningterror@users.noreply.github.com>
Date: Wed, 23 Sep 2020 13:53:10 +0200
Subject: [PATCH] nsis: Remove dx runtimes.

---
 nsis/SharedCore.nsh | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/nsis/SharedCore.nsh b/nsis/SharedCore.nsh
index 33977d0c75..473ab27552 100644
--- a/nsis/SharedCore.nsh
+++ b/nsis/SharedCore.nsh
@@ -3,7 +3,7 @@
   ; Ideally this would default to 'current' for user-level installs and 'all' for admin-level installs.
   ; There are problems to be aware of, however!
   ;
-  ; * If the user is an admin, Windows Vista/7 will DEFAULT to an "all" shell context (installing shortcuts
+  ; * If the user is an admin, Windows will DEFAULT to an "all" shell context (installing shortcuts
   ;   for all users), even if we don't want it to (which causes the uninstaller to fail!)
   ; * If the user is not an admin, setting Shell Context to all will cause the installer to fail because the
   ;   user won't have permission enough to install it at all (sigh).
@@ -20,23 +20,13 @@ Function RedistInstallation
 ReadRegDword $R5 HKLM "SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x86" "Installed"
 
 ${If} $R5 == "1"
-    Goto DxSetup
+    Return
 ${EndIf}
 
 ; Download and install the VC redistributable from the internet
 inetc::get /CONNECTTIMEOUT 30 /RECEIVETIMEOUT 30 "https://aka.ms/vs/16/release/VC_redist.x86.exe" "$TEMP\VC_redist.x86.exe" /END
     ExecShellWait open "$TEMP\VC_redist.x86.exe" "/INSTALL /Q /NORESTART"
     Delete "$TEMP\VC_redist.x86.exe"
-
-DxSetup:
-${If} ${AtLeastWin8.1}
-Return
-${EndIf}
-
-; Download and install DirectX (only applies to OSes older than 8.1)
-inetc::get /CONNECTTIMEOUT 30 /RECEIVETIMEOUT 30 "https://download.microsoft.com/download/1/7/1/1718CCC4-6315-4D8E-9543-8E28A4E18C4C/dxwebsetup.exe" "$TEMP/dxwebsetup.exe" /END
-    ExecShellWait open "$TEMP\dxwebsetup.exe" "/Q"
-    Delete "$TEMP\dxwebsetup.exe"
 FunctionEnd
 
 Section "" SEC_REDIST