summaryrefslogtreecommitdiff
path: root/res/ari/resource_bridges.c
diff options
context:
space:
mode:
authorzuul <zuul@gerrit.asterisk.org>2016-03-31 13:20:55 -0500
committerGerrit Code Review <gerrit2@gerrit.digium.api>2016-03-31 13:20:55 -0500
commite2a8033d0966f9ce858bbe5a6dc9155ea48e095f (patch)
tree747fec094659c039a64d97cf7097451c36652a9a /res/ari/resource_bridges.c
parent0ec3299c5fd97ca3f85531fb0fadb6feb932c0cc (diff)
parent0ea742d33a89c8d1d3b92eceb833cbe79faab954 (diff)
Merge "res_stasis: Add control ref to playback and recording structs."
Diffstat (limited to 'res/ari/resource_bridges.c')
-rw-r--r--res/ari/resource_bridges.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/res/ari/resource_bridges.c b/res/ari/resource_bridges.c
index 759947a12..6018c43be 100644
--- a/res/ari/resource_bridges.c
+++ b/res/ari/resource_bridges.c
@@ -296,10 +296,11 @@ static void *bridge_channel_control_thread(void *data)
thread_data = NULL;
stasis_app_control_execute_until_exhausted(bridge_channel, control);
+ stasis_app_control_flush_queue(control);
- ast_hangup(bridge_channel);
- ao2_cleanup(control);
stasis_forward_cancel(forward);
+ ao2_cleanup(control);
+ ast_hangup(bridge_channel);
return NULL;
}