Merge commit 'coling/master'

This commit is contained in:
Lennart Poettering 2009-03-02 14:08:11 +01:00
commit 77514c1c4c
6 changed files with 61 additions and 37 deletions

View file

@ -148,7 +148,7 @@ static void reserve_update(struct userdata *u) {
const char *description;
pa_assert(u);
if (!u->sink)
if (!u->sink || !u->reserve)
return;
if ((description = pa_proplist_gets(u->sink->proplist, PA_PROP_DEVICE_DESCRIPTION)))