kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 03:20:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Joshua Colp
2016-11-08 04:59:24 -06:00
committed by Gerrit Code Review
parent dbbd1b8834 d30415bfa1
commit 3019dfd49f
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
res/res_stasis.c
View File

@@ -1328,7 +1328,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);
}
@@ -1389,7 +1391,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 */