[svn-commits] dlee: trunk r402929 - in /trunk: ./ res/res_stasis.c

[SVN commits to the Digium repositories]

Author: dlee
Date: Thu Nov 21 09:57:40 2013
New Revision: 402929

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=402929
Log:
stasis: Fixed scoping problem with bridge tracking.
........

Merged revisions 402817 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/res/res_stasis.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-12-merged (original)
+++ branch-12-merged Thu Nov 21 09:57:40 2013
@@ -1,1 +1,1 @@
-/branches/12:1-398558,398560-398577,398579-399305,399307-401390,401392-402738,402755,402757,402767,402769,402787,402793,402804,402838,402864,402891,402926
+/branches/12:1-398558,398560-398577,398579-399305,399307-401390,401392-402738,402755,402757,402767,402769,402787,402793,402804,402817,402838,402864,402891,402926

Modified: trunk/res/res_stasis.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_stasis.c?view=diff&rev=402929&r1=402928&r2=402929
==============================================================================
--- trunk/res/res_stasis.c (original)
+++ trunk/res/res_stasis.c Thu Nov 21 09:57:40 2013
@@ -704,6 +704,7 @@
 
 	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 @@
 		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 */