From 182fd5a3628c1b4ddcf3d5fbee425bc978593aeb Mon Sep 17 00:00:00 2001 From: Mathieu Comandon Date: Sat, 19 May 2018 10:47:37 -0700 Subject: [PATCH] Properly set system environment variables for wine (Fixes #875) --- lutris/runners/runner.py | 1 - lutris/runners/wine.py | 7 ++++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lutris/runners/runner.py b/lutris/runners/runner.py index 9a0a969bd..26cc772f1 100644 --- a/lutris/runners/runner.py +++ b/lutris/runners/runner.py @@ -151,7 +151,6 @@ class Runner: def get_env(self, os_env=False): env = {} - if os_env: env.update(os.environ.copy()) diff --git a/lutris/runners/wine.py b/lutris/runners/wine.py index fc173c414..4b5b2bdaa 100644 --- a/lutris/runners/wine.py +++ b/lutris/runners/wine.py @@ -1018,7 +1018,12 @@ class wine(Runner): return overrides def get_env(self, os_env=True): - env = super(wine, self).get_env(os_env) + """Return environment variables used by the game""" + # Always false to runner.get_env, the default value + # of os_env is inverted in that class. + env = super(wine, self).get_env(False) + if os_env: + env.update(os.environ.copy()) env['WINEDEBUG'] = self.runner_config.get('show_debug', '-all') env['WINEARCH'] = self.wine_arch env['WINE'] = self.get_executable()