summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Jordan <mjordan@digium.com>2015-09-28 08:36:09 -0500
committerGerrit Code Review <gerrit2@gerrit.digium.api>2015-09-28 08:36:09 -0500
commit5784675ee10acbb2978fdf77c6fa645069e3e597 (patch)
tree642df61d9f5bd81b44cd0de3493ca5352cea1e94
parent96c26f497ab8b96e538afed7f6ee7e907ea21eec (diff)
parent9402f80726c2191c939aa75af1c8360409e5d2ef (diff)
Merge "res/res_stasis: Fix accidental subscription to 'all' bridge topic"
-rw-r--r--res/res_stasis.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/res/res_stasis.c b/res/res_stasis.c
index 69e9b935d..abca895ee 100644
--- a/res/res_stasis.c
+++ b/res/res_stasis.c
@@ -1294,7 +1294,9 @@ int stasis_app_exec(struct ast_channel *chan, const char *app_name, int argc,
if (bridge != last_bridge) {
app_unsubscribe_bridge(app, last_bridge);
- app_subscribe_bridge(app, bridge);
+ if (bridge) {
+ app_subscribe_bridge(app, bridge);
+ }
}
if (bridge) {