[svn-commits] file: trunk r410919 - in /trunk: ./ res/res_stasis.c

[SVN commits to the Digium repositories]

Author: file
Date: Wed Mar 19 09:25:31 2014
New Revision: 410919

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=410919
Log:
res_stasis: Fix a bug where the default bridge type was not set.
........

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

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

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.

Modified: trunk/res/res_stasis.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_stasis.c?view=diff&rev=410919&r1=410918&r2=410919
==============================================================================
--- trunk/res/res_stasis.c (original)
+++ trunk/res/res_stasis.c Wed Mar 19 09:25:31 2014
@@ -588,7 +588,7 @@
 struct ast_bridge *stasis_app_bridge_create(const char *type, const char *name, const char *id)
 {
 	struct ast_bridge *bridge;
-	char *requested_type, *requested_types = ast_strdupa(type);
+	char *requested_type, *requested_types = ast_strdupa(S_OR(type, "mixing"));
 	int capabilities = 0;
 	int flags = AST_BRIDGE_FLAG_MERGE_INHIBIT_FROM | AST_BRIDGE_FLAG_MERGE_INHIBIT_TO
 		| AST_BRIDGE_FLAG_SWAP_INHIBIT_FROM | AST_BRIDGE_FLAG_SWAP_INHIBIT_TO