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

diff --git a/src/polypcore/namereg.c b/src/polypcore/namereg.c
index d4dbd14bba5e2393f04170ccfd4693aef941a716..9229a0f99a8a85f683d42328cb294b559800f748 100644 (file)
--- 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 ace9db6fbee48b1e615588a9846e3bc04c815686..a0fc286da8cea1f9c6d4b0cc129aaf6aa8721ceb 100644 (file)
--- 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 &&