diff options
| author | Markus Härer <markus.haerer@gmx.net> | 2024-04-26 05:15:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-26 05:15:37 +0200 |
| commit | 78a7c39ffaff12fa1f83ab2159c6bb0eb14a3b2c (patch) | |
| tree | e6984f65d0f1576c0045a55d601a04771e4fde4f | |
| parent | 9bd1b8f4370a05f4e58ad7c6ef72de1a529f1da7 (diff) | |
| parent | 5f19a377c5550b170d81ea026d36b5d2fb5591cf (diff) | |
| download | xbmc-78a7c39ffaff12fa1f83ab2159c6bb0eb14a3b2c.tar.xz | |
Merge pull request #25050 from manfred-h/master
Update kodi.sh.in to make usage of ENV_ARGS safe when both, KODI_AE_SINK and KODI_GL_INTERFACE, are used in parallel.
| -rw-r--r-- | tools/Linux/kodi.sh.in | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/Linux/kodi.sh.in b/tools/Linux/kodi.sh.in index 52d4646db5..3d86c86834 100644 --- a/tools/Linux/kodi.sh.in +++ b/tools/Linux/kodi.sh.in @@ -171,6 +171,7 @@ if command_exists gdb; then fi fi +ENV_ARGS= if [ -n "${KODI_AE_SINK}" ]; then echo "KODI_AE_SINK env variable is deprecated and will be removed in the future." @@ -197,11 +198,11 @@ if [ -n "${KODI_GL_INTERFACE}" ]; then echo "Use the --gl-interface command line switch instead." if [ "${KODI_GL_INTERFACE}" = "GLX" ]; then - ENV_ARGS="--gl-interface=glx" + ENV_ARGS="${ENV_ARGS} --gl-interface=glx" elif [ "${KODI_GL_INTERFACE}" = "EGL" ]; then - ENV_ARGS="--gl-interface=egl" + ENV_ARGS="${ENV_ARGS} --gl-interface=egl" elif [ "${KODI_GL_INTERFACE}" = "EGL_PB" ]; then - ENV_ARGS="--gl-interface=egl-pb" + ENV_ARGS="${ENV_ARGS} --gl-interface=egl-pb" fi fi |