From d353d8043addf947a88646ef4e44ce583c4c9a48 Mon Sep 17 00:00:00 2001
From: koplo199 <85577251+koplo199@users.noreply.github.com>
Date: Sun, 24 Dec 2023 18:42:02 +0100
Subject: [PATCH 1/3] fix: run from CLI

---
 bottles/frontend/cli/cli.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bottles/frontend/cli/cli.py b/bottles/frontend/cli/cli.py
index b3f38627fa..f36e24d131 100644
--- a/bottles/frontend/cli/cli.py
+++ b/bottles/frontend/cli/cli.py
@@ -570,8 +570,9 @@ def run_program(self):
 
             program = [p for p in programs if p["name"] == _program][0]
             _executable = program.get("path", "")
-            if _keep:
-                _args = program.get("arguments", "") + " " + _args
+            _program_args = program.get("arguments", "")
+            if _keep and _program_args:
+                _args = _program_args + " " + _args
             _cwd = program.get("folder", "")
             _script = program.get("script", None)
 

From f4326b0d68ea721e8c92a47207586cba7a866f71 Mon Sep 17 00:00:00 2001
From: koplo199 <85577251+koplo199@users.noreply.github.com>
Date: Sun, 31 Dec 2023 10:42:01 +0100
Subject: [PATCH 2/3] fix: Launch preferences

---
 bottles/frontend/cli/cli.py               | 2 +-
 bottles/frontend/windows/launchoptions.py | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/bottles/frontend/cli/cli.py b/bottles/frontend/cli/cli.py
index f36e24d131..ce27c615fe 100644
--- a/bottles/frontend/cli/cli.py
+++ b/bottles/frontend/cli/cli.py
@@ -570,7 +570,7 @@ def run_program(self):
 
             program = [p for p in programs if p["name"] == _program][0]
             _executable = program.get("path", "")
-            _program_args = program.get("arguments", "")
+            _program_args = program.get("arguments")
             if _keep and _program_args:
                 _args = _program_args + " " + _args
             _cwd = program.get("folder", "")
diff --git a/bottles/frontend/windows/launchoptions.py b/bottles/frontend/windows/launchoptions.py
index f06804dc9a..db2a9a0aa9 100644
--- a/bottles/frontend/windows/launchoptions.py
+++ b/bottles/frontend/windows/launchoptions.py
@@ -79,7 +79,8 @@ def __init__(self, parent, config, program, **kwargs):
         self.set_transient_for(self.window)
 
         # set widget defaults
-        self.entry_arguments.set_text(program.get("arguments", ""))
+        if program.get("arguments") not in ["", None]:
+            self.entry_arguments.set_text(program.get("arguments"))
 
         # keeps track of toggled switches
         self.toggled = {}

From d4abcc344724855aad35fdfb3aa3670f68c10883 Mon Sep 17 00:00:00 2001
From: koplo199 <85577251+koplo199@users.noreply.github.com>
Date: Wed, 17 Jan 2024 17:07:52 +0000
Subject: [PATCH 3/3] fix: Remove obsolete faudio dependency

---
 bottles/backend/models/samples.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bottles/backend/models/samples.py b/bottles/backend/models/samples.py
index 21b3a2d85b..73313693e2 100644
--- a/bottles/backend/models/samples.py
+++ b/bottles/backend/models/samples.py
@@ -22,7 +22,6 @@ class Samples:
                 "d3dcompiler_47",
                 "mono",
                 "gecko",
-                "faudio",
             ]
         },
         "application": {