[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.15-38-gedba78c

[Lennart Poettering]

This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.

The master branch has been updated
      from  ad12d7d4b020e6be225a8d6494de69d051ec7f81 (commit)

- Log -----------------------------------------------------------------
edba78c start-pulseaudio-x11: don't start a local sound server if a remote sound server is configured
-----------------------------------------------------------------------

Summary of changes:
 src/daemon/start-pulseaudio-x11.in |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

-----------------------------------------------------------------------

commit edba78c8e07bd6794c366dfb2b513a6aaaf26aa3
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Apr 22 22:05:20 2009 +0200

    start-pulseaudio-x11: don't start a local sound server if a remote sound server is configured

diff --git a/src/daemon/start-pulseaudio-x11.in b/src/daemon/start-pulseaudio-x11.in
index 391a6d3..c57c489 100755
--- a/src/daemon/start-pulseaudio-x11.in
+++ b/src/daemon/start-pulseaudio-x11.in
@@ -19,6 +19,8 @@
 
 set -e
 
+[ -z "$PULSE_SERVER" ]
+
 @PA_BINARY@ --start "$@"
 
 if [ x"$DISPLAY" != x ] ; then

-- 
hooks/post-receive
PulseAudio Sound Server