X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=all;h=38b65d5c062991b625271569c48fbe43ef624b8e;hb=68454eab14a22ec7700f7da164e0dbdb9444b157;hp=80b78de396a55febc1080e6a09af8b22472b9367;hpb=fdc1b70ed7fe2da4dfdec19a04b13ac8ead2e836;p=xonotic%2Fxonotic.git

diff --git a/all b/all
index 80b78de3..38b65d5c 100755
--- a/all
+++ b/all
@@ -302,7 +302,8 @@ case "$cmd" in
 						if [ -n "$srcbranch" ]; then
 							b=$srcbranch
 						else
-							b="`repobranch "$d"`"
+							b=origin/"`repobranch "$d"`"
+							verbose git fetch origin || true
 						fi
 						# TODO do this without pushing
 						verbose git push "$remote" "$b":"$branch"
@@ -522,9 +523,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