fix suspending in module-combine.c

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

diff --git a/src/modules/module-combine.c b/src/modules/module-combine.c
index 656cef9..d9c2af6 100644 (file)
--- a/src/modules/module-combine.c
+++ b/src/modules/module-combine.c
@@ -450,7 +450,7 @@ static void sink_input_detach_cb(pa_sink_input *i) {
     pa_sink_input_assert_ref(i);
     pa_assert_se(o = i->userdata);
 
-    pa_log("detaching %s", i->sink->name);
+/*     pa_log("detaching %s", i->sink->name); */
 
     pa_assert(o->inq_rtpoll_item);
     pa_rtpoll_item_free(o->inq_rtpoll_item);
@@ -516,6 +516,9 @@ static int suspend(struct userdata *u) {
 
     /* Let's suspend by unlinking all streams */
 
+    if (update_master(u, NULL) < 0)
+        pa_module_unload_request(u->module);
+
     for (o = pa_idxset_first(u->outputs, &idx); o; o = pa_idxset_next(u->outputs, &idx)) {
 
         if (o->sink_input) {
@@ -525,9 +528,6 @@ static int suspend(struct userdata *u) {
         }
     }
 
-    if (pick_master(u, NULL) < 0)
-        pa_module_unload_request(u->module);
-
     pa_log_info("Device suspended...");
 
     return 0;