kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-06-16 04:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Joshua Colp
2016-11-08 05:00:06 -06:00
committed by Gerrit Code Review
parent 5873438150 cfede6a1fc
commit 5ad463581f
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
res/res_stasis.c
+6 -2
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));
if (bridge != last_bridge) {
app_unsubscribe_bridge(app, last_bridge);
if (last_bridge) {
app_unsubscribe_bridge(app, last_bridge);
}
if (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);
}
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);
/* Only publish a stasis_end event if it hasn't already been published */