Merge pull request #3211 from koplo199/bottlesdevs-pr

fix: run program from CLI and launch preferences

bottles/backend/models/samples.py

@@ -22,7 +22,6 @@ class Samples:
  "d3dcompiler_47",
  "mono",
  "gecko",
- "faudio",
  ]
  },
  "application": {

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)
 

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 = {}