diff options
| author | Lennart Poettering <lennart@poettering.net> | 2006-04-27 22:59:54 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2006-04-27 22:59:54 +0000 |
| commit | cd93661dcbe04081617d932058f472bd496ad3d2 (patch) | |
| tree | 93fd735cb6729830cc697dd1aadf3b57a97b22c5 /src | |
| parent | 22c679e393b234158b953b04956c886cbf1a2a5d (diff) | |
ouch!
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/polypcore/namereg.c | 4 | ||||
| -rw-r--r-- | src/polypcore/protocol-native.c | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/polypcore/namereg.c b/src/polypcore/namereg.c index d4dbd14b..9229a0f9 100644 --- a/src/polypcore/namereg.c +++ b/src/polypcore/namereg.c @@ -127,7 +127,7 @@ void* pa_namereg_get(pa_core *c, const char *name, pa_namereg_type_t type, int a return NULL; if (c->namereg && (e = pa_hashmap_get(c->namereg, name))) - if (e->type == e->type) + if (e->type == type) return e->data; 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); if (c->namereg && (e = pa_hashmap_get(c->namereg, name))) - if (e->type == e->type) + if (e->type == type) return e->data; } diff --git a/src/polypcore/protocol-native.c b/src/polypcore/protocol-native.c index ace9db6f..a0fc286d 100644 --- a/src/polypcore/protocol-native.c +++ b/src/polypcore/protocol-native.c @@ -1347,7 +1347,6 @@ static void command_get_info(PA_GCC_UNUSED pa_pdispatch *pd, uint32_t command, u pa_tagstruct *reply; assert(c && t); - if (pa_tagstruct_getu32(t, &idx) < 0 || (command != PA_COMMAND_GET_CLIENT_INFO && command != PA_COMMAND_GET_MODULE_INFO && |