From 8e933ccf0461eddfd3d81394c85c5efe90dca8c9 Mon Sep 17 00:00:00 2001 From: sewn Date: Fri, 6 Dec 2024 08:56:34 +0300 Subject: [PATCH] cmd/vinegar: minor code changes --- cmd/vinegar/binary.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cmd/vinegar/binary.go b/cmd/vinegar/binary.go index 0fe8d16d..d608ccaa 100644 --- a/cmd/vinegar/binary.go +++ b/cmd/vinegar/binary.go @@ -96,7 +96,6 @@ func NewBinary(bt clientsettings.BinaryType, cfg *config.Config) (*Binary, error } pfx := wine.New(BinaryPrefixDir(bt), bcfg.WineRoot) - os.Setenv("GAMEID", "ulwgl-roblox") return &Binary{ Presence: rp, @@ -193,6 +192,10 @@ func (b *Binary) Init() error { firstRun = true } + if c := b.Prefix.Wine(""); c.Err != nil { + return fmt.Errorf("wine: %w", c.Err) + } + if firstRun && !sysinfo.CPU.AVX { b.Splash.Dialog(DialogNoAVX, false, "") slog.Warn("Running roblox without AVX, Roblox will most likely fail to run!") @@ -219,7 +222,7 @@ func (b *Binary) Init() error { } if err != nil { - return err + return fmt.Errorf("pfx init: %w", err) } if err := b.InstallWebView(); err != nil {