From c5c20ca9693da58f2ed0e8e6808708301edf9105 Mon Sep 17 00:00:00 2001
From: sewn <sewn@disroot.org>
Date: Thu, 3 Aug 2023 09:21:25 +0300
Subject: [PATCH] allow for dxvk usage and installation only during player
 routine

---
 config.go | 5 -----
 roblox.go | 8 +++++++-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/config.go b/config.go
index 82fb3fc4..22254ff2 100644
--- a/config.go
+++ b/config.go
@@ -65,11 +65,6 @@ func LoadConfigFile() Configuration {
 		config.Env["PATH"] = filepath.Join(config.WineRoot, "bin") + ":" + os.Getenv("PATH")
 	}
 
-	if config.Dxvk {
-		// Tells wine to use the DXVK DLLs
-		config.Env["WINEDLLOVERRIDES"] += "d3d10core=n;d3d11=n;d3d9=n;dxgi=n"
-	}
-
 	for name, value := range config.Env {
 		os.Setenv(name, value)
 	}
diff --git a/roblox.go b/roblox.go
index ce929c3a..839b28eb 100644
--- a/roblox.go
+++ b/roblox.go
@@ -184,6 +184,13 @@ func RobloxPlayer(args ...string) {
 	rblx.GetVersion("version")
 
 	rblx.Setup()
+
+	DxvkStrap()
+	if config.Dxvk {
+		// Tells wine to use the DXVK DLLs
+		config.Env["WINEDLLOVERRIDES"] += "d3d10core=n;d3d11=n;d3d9=n;dxgi=n"
+	}
+
 	rblx.ApplyFFlags("Client")
 	rblx.Execute("RobloxPlayerBeta.exe", args)
 	RobloxKillPfx()
@@ -200,7 +207,6 @@ func RobloxStudio(args ...string) {
 	rblx.PackageDests = StudioPackages()
 	rblx.SetupURL(channel)
 	rblx.GetVersion("versionQTStudio")
-	Config.Dxvk = false // Dxvk doesnt work under Studio
 
 	rblx.Setup()
 	rblx.ApplyFFlags("Studio")