summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid M. Lee <dlee@digium.com>2013-11-21 15:57:40 +0000
committerDavid M. Lee <dlee@digium.com>2013-11-21 15:57:40 +0000
commitf0ccc59a22553f47be857a7333914957983bbcb8 (patch)
tree71364c66f97c82121fe72db705b05dc5907527c2
parentd1ad4a95f8967cc407d828af258c772aa69ab6e3 (diff)
stasis: Fixed scoping problem with bridge tracking.
........ Merged revisions 402817 from http://svn.asterisk.org/svn/asterisk/branches/12 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@402929 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r--res/res_stasis.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/res/res_stasis.c b/res/res_stasis.c
index 8fe4ab4b4..e5fe1f691 100644
--- a/res/res_stasis.c
+++ b/res/res_stasis.c
@@ -704,6 +704,7 @@ int stasis_app_exec(struct ast_channel *chan, const char *app_name, int argc,
RAII_VAR(struct app *, app, NULL, ao2_cleanup);
RAII_VAR(struct stasis_app_control *, control, NULL, control_unlink);
+ struct ast_bridge *last_bridge = NULL;
int res = 0;
ast_assert(chan != NULL);
@@ -745,7 +746,6 @@ int stasis_app_exec(struct ast_channel *chan, const char *app_name, int argc,
RAII_VAR(struct ast_frame *, f, NULL, ast_frame_dtor);
int r;
int command_count;
- struct ast_bridge *last_bridge = NULL;
struct ast_bridge *bridge = NULL;
/* Check to see if a bridge absorbed our hangup frame */