fix brown paperbag bug which was triggered when runnign "pavumeter" and
specifying a sink on the command line.



git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@817 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2006-04-27 22:59:54 +00:00
parent 22c679e393
commit cd93661dcb
2 changed files with 2 additions and 3 deletions

View file

@ -127,7 +127,7 @@ void* pa_namereg_get(pa_core *c, const char *name, pa_namereg_type_t type, int a
return NULL; return NULL;
if (c->namereg && (e = pa_hashmap_get(c->namereg, name))) if (c->namereg && (e = pa_hashmap_get(c->namereg, name)))
if (e->type == e->type) if (e->type == type)
return e->data; return e->data;
if (pa_atou(name, &idx) < 0) { if (pa_atou(name, &idx) < 0) {
@ -136,7 +136,7 @@ void* pa_namereg_get(pa_core *c, const char *name, pa_namereg_type_t type, int a
pa_autoload_request(c, name, type); pa_autoload_request(c, name, type);
if (c->namereg && (e = pa_hashmap_get(c->namereg, name))) if (c->namereg && (e = pa_hashmap_get(c->namereg, name)))
if (e->type == e->type) if (e->type == type)
return e->data; return e->data;
} }

View file

@ -1347,7 +1347,6 @@ static void command_get_info(PA_GCC_UNUSED pa_pdispatch *pd, uint32_t command, u
pa_tagstruct *reply; pa_tagstruct *reply;
assert(c && t); assert(c && t);
if (pa_tagstruct_getu32(t, &idx) < 0 || if (pa_tagstruct_getu32(t, &idx) < 0 ||
(command != PA_COMMAND_GET_CLIENT_INFO && (command != PA_COMMAND_GET_CLIENT_INFO &&
command != PA_COMMAND_GET_MODULE_INFO && command != PA_COMMAND_GET_MODULE_INFO &&