CodeMirror/Rare
1
0
Fork 0
mirror of synced 2024-06-02 10:44:40 +12:00
Code Issues Projects Releases Wiki Activity

Merge pull request #399 from loathingKernel/develop

Browse source 
WineResolver: Do not unset 'DISPLAY' when running silently
This commit is contained in:
Stelios Tsampas 2024-05-15 15:18:14 +03:00 committed by GitHub
parent 8f018cb162 0c848c41b0
commit 0ddd5a0674
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
rare/utils/compat/utils.py
View file

@ -61,7 +61,7 @@ def execute_subprocess(command: List[str], arguments: List[str], environment: Ma
out, err = out.decode("utf-8", "ignore") if out else "", err.decode("utf-8", "ignore") if err else ""
# lk: the following is a work-around for wineserver sometimes hanging around after
proc = get_configured_subprocess(command + ["wineboot", "-k"], environment)
proc = get_configured_subprocess(command + ["wineboot", "-e"], environment)
_, _ = proc.communicate()
return out, err
@ -77,7 +77,7 @@ def execute_qprocess(command: List[str], arguments: List[str], environment: Mapp
proc.deleteLater()
# lk: the following is a work-around for wineserver sometimes hanging around after
proc = get_configured_qprocess(command + ["wineboot", "-k"], environment)
proc = get_configured_qprocess(command + ["wineboot", "-e"], environment)
proc.start()
proc.waitForFinished(-1)
proc.deleteLater()
@ -166,5 +166,5 @@ def get_host_environment(app_environment: Dict, silent: bool = True) -> Dict:
_environ["WINEDEBUG"] = "-all"
_environ["WINEDLLOVERRIDES"] = "winemenubuilder=d;mscoree=d;mshtml=d;"
# lk: pressure-vessel complains about this but it doesn't fail due to it
_environ["DISPLAY"] = ""
#_environ["DISPLAY"] = ""
return _environ