binary: Moved setenv from pickCard into setup.

vinegarhq · Oct 24, 2023 · 12c8a17 · 12c8a17
1 parent e0f46e1
commit 12c8a17
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/internal/config/cardpick.go b/internal/config/cardpick.go
@@ -75,8 +75,5 @@ func (b *Binary) pickCard() error {
 	} else {
 		b.Env.Set("__GLX_VENDOR_LIBRARY_NAME", "mesa")
 	}
-
-	b.Env.Setenv()
-
 	return nil
 }
diff --git a/internal/config/config.go b/internal/config/config.go
@@ -122,7 +122,12 @@ func (b *Binary) setup() error {
 		return errors.New("invalid renderer given")
 	}
 
-	return b.pickCard()
+	if err := b.pickCard(); err != nil {
+		return err
+	}
+
+	b.Env.Setenv()
+	return nil
 }
 
 func (c *Config) setup() error {