From 66aba23626a5a5bfb477b7c568e6a75a795082bf Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@collabora.com>
Date: Wed, 17 Mar 2021 12:10:33 +0000
Subject: [PATCH] pv-wrap: Don't force PulseAudio to be default when not using
 a runtime

When we're not using a runtime, we don't know for sure whether
PulseAudio is even available, and we also won't be able to create
a mount point in /etc because we're using the host's /etc as-is.

Signed-off-by: Simon McVittie <smcv@collabora.com>
---
 pressure-vessel/wrap.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pressure-vessel/wrap.c b/pressure-vessel/wrap.c
index 0b578c0af..78c48d398 100644
--- a/pressure-vessel/wrap.c
+++ b/pressure-vessel/wrap.c
@@ -2417,8 +2417,9 @@ main (int argc,
                            (runtime != NULL),
                            is_flatpak_env);
 
-  if (pv_environ_is_locked(container_env, "PULSE_SERVER")
-      || is_flatpak_env)
+  if (runtime != NULL
+      && (pv_environ_is_locked(container_env, "PULSE_SERVER")
+          || is_flatpak_env))
     {
       /* Make the PulseAudio driver the default.
        * We do this unconditionally when we are under Flatpak for parity
-- 
GitLab