Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge "res_stasis: Don't unsubscribe from a NULL bridge." into 14

Browse Source
changes/40/4340/1
Joshua Colp 9 years ago committed by Gerrit Code Review
parent 5873438150 cfede6a1fc
commit 5ad463581f
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File

8
res/res_stasis.c
Unescape View File

@ -1330,7 +1330,9 @@ int stasis_app_exec(struct ast_channel *chan, const char *app_name, int argc,
bridge = ao2_bump(stasis_app_get_bridge(control)); bridge = ao2_bump(stasis_app_get_bridge(control));
if (bridge != last_bridge) { if (bridge != last_bridge) {
app_unsubscribe_bridge(app, last_bridge); if (last_bridge) {
app_unsubscribe_bridge(app, last_bridge);
}
if (bridge) { if (bridge) {
app_subscribe_bridge(app, bridge); app_subscribe_bridge(app, bridge);
} }
@ -1391,7 +1393,9 @@ int stasis_app_exec(struct ast_channel *chan, const char *app_name, int argc,
ast_bridge_depart(chan); ast_bridge_depart(chan);
} }
app_unsubscribe_bridge(app, stasis_app_get_bridge(control)); if (stasis_app_get_bridge(control)) {
app_unsubscribe_bridge(app, stasis_app_get_bridge(control));
}
ao2_cleanup(bridge); ao2_cleanup(bridge);
/* Only publish a stasis_end event if it hasn't already been published */ /* Only publish a stasis_end event if it hasn't already been published */

Write Preview
Loading…
Cancel
Save