merge r2186 from prepare-0.9.10

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2202 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2008-03-31 22:06:46 +00:00
parent 6734fba80c
commit 79938c9f00

View file

@ -723,7 +723,7 @@ static void sink_info_cb(pa_pdispatch *pd, uint32_t command, PA_GCC_UNUSED uint3
goto fail; goto fail;
} }
if (strcmp(name, u->sink_name)) if (!u->sink_name || strcmp(name, u->sink_name))
return; return;
pa_xfree(u->device_description); pa_xfree(u->device_description);
@ -836,7 +836,7 @@ static void source_info_cb(pa_pdispatch *pd, uint32_t command, PA_GCC_UNUSED uin
goto fail; goto fail;
} }
if (strcmp(name, u->source_name)) if (!u->source_name || strcmp(name, u->source_name))
return; return;
pa_xfree(u->device_description); pa_xfree(u->device_description);