diff options
author | Colin Guthrie <cguthrie@mandriva.org> | 2011-03-25 23:03:31 +0000 |
---|---|---|
committer | Colin Guthrie <cguthrie@mandriva.org> | 2011-03-25 23:14:28 +0000 |
commit | 7aa8a3fa8015d17240e5fc27bf44eb7d22e7e13a (patch) | |
tree | cecc44a855e85b870c8124e5396372d567424d95 /pulseaudio.svg | |
parent | 34ddc5b9c533ed83d53238fff0777663f9c50336 (diff) |
daemon: Fix regression introduced in f1d1447e.
With Tanu's patch, the server no longer starts when a server is configured.
While this is sensible in most circumstances there is a corner case where
we still want to start.
In a typical X11 login, module-x11-publish will be loaded and will thus
set the PULSE_SERVER X11 property on the root window. This then hits the
check introduced in f1d1447e and exits. If PA had previously crashed
(thus leaving behind it's X11 properties) then this means that we will not
autospawn nor even allow ourselves to be started manually until
pax11publish -r is run to clear out the X11 properties. This is obviously
not desirable.
This patch introduces a more in-depth check of the server. If it looks like
a local unix domain socket, then we do not exit straight away and instead
probe further. This should not pose any problems with e.g. remote SSH
usage as the DBus Machine ID is used in the server string.
Diffstat (limited to 'pulseaudio.svg')
0 files changed, 0 insertions, 0 deletions