many fixes

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@37 fefdeb5f-60dc-0310-8127-8f9354f1896f

1 files changed, 3 insertions, 2 deletions

diff --git a/src/pdispatch.c b/src/pdispatch.c
index 15f4b1b5..65dcd747 100644
--- a/src/pdispatch.c
+++ b/src/pdispatch.c
@@ -22,7 +22,9 @@ struct pdispatch {
 
 static void reply_info_free(struct reply_info *r) {
     assert(r && r->pdispatch && r->pdispatch->mainloop);
-    r->pdispatch->mainloop->cancel_time(r->pdispatch->mainloop, r->mainloop_timeout);
+
+    if (r->pdispatch)
+        r->pdispatch->mainloop->cancel_time(r->pdispatch->mainloop, r->mainloop_timeout);
 
     if (r->previous)
         r->previous->next = r->next;
@@ -112,7 +114,6 @@ fail:
     if (ts)
         tagstruct_free(ts);    
 
-    fprintf(stderr, "protocol-native: invalid packet.\n");
     return -1;
 }