summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/modules/module-combine.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/modules/module-combine.c b/src/modules/module-combine.c
index 656cef92..d9c2af6d 100644
--- 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;