X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=935a58ae0c8327034a5b39b25b736688c4f65913;hp=80b78de396a55febc1080e6a09af8b22472b9367;hb=0c42904f584de75ba9d8014b8c2f42bd574160cc;hpb=fdc1b70ed7fe2da4dfdec19a04b13ac8ead2e836

diff --git a/all b/all
index 80b78de3..935a58ae 100755
--- a/all
+++ b/all
@@ -522,9 +522,11 @@ case "$cmd" in
 		set -- "darkplaces/darkplaces$client" -nexuiz -customgamename Xonotic -customgamedirname1 data -customgamedirname2 "" -customgamescreenshotname xonotic -customgameuserdirname xonotic "$@"
 
 		# if pulseaudio is running: USE IT
-		if ps -C pulseaudio >/dev/null; then
-			if ldd /usr/lib/libSDL.so 2>/dev/null | grep pulse >/dev/null; then
-				export SDL_AUDIODRIVER=pulse
+		if [ -z "$SDL_AUDIODRIVER" ] && ! [ -n "$WE_HATE_OUR_USERS" ]; then
+			if ps -C pulseaudio >/dev/null; then
+				if ldd /usr/lib/libSDL.so 2>/dev/null | grep pulse >/dev/null; then
+					export SDL_AUDIODRIVER=pulse
+				fi
 			fi
 		fi