summaryrefslogtreecommitdiffstats
path: root/polyp/client-conf-x11.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2005-01-06 01:07:43 +0000
committerLennart Poettering <lennart@poettering.net>2005-01-06 01:07:43 +0000
commitfb11e45cfd84290985e5a3c6f4c7a25fb1eab83c (patch)
tree59f65ccde5313c75514d1e0427856e49bf8c65a9 /polyp/client-conf-x11.c
parent8199925cec93c9e7908f9afa9d18718623af13ee (diff)
minor fixes
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@329 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'polyp/client-conf-x11.c')
-rw-r--r--polyp/client-conf-x11.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/polyp/client-conf-x11.c b/polyp/client-conf-x11.c
index eb471033..383aa64e 100644
--- a/polyp/client-conf-x11.c
+++ b/polyp/client-conf-x11.c
@@ -15,7 +15,7 @@
You should have received a copy of the GNU Lesser General Public License
along with polypaudio; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-13071
USA.
***/
@@ -48,11 +48,10 @@ int pa_client_conf_from_x11(struct pa_client_conf *c, const char *dname) {
goto finish;
}
- if (!pa_x11_get_prop(d, "POLYP_SERVER", t, sizeof(t)))
- goto finish;
-
- pa_xfree(c->default_server);
- c->default_server = pa_xstrdup(t);
+ if (pa_x11_get_prop(d, "POLYP_SERVER", t, sizeof(t))) {
+ pa_xfree(c->default_server);
+ c->default_server = pa_xstrdup(t);
+ }
if (pa_x11_get_prop(d, "POLYP_SINK", t, sizeof(t))) {
pa_xfree(c->default_sink);