From: Joshua Colp <jcolp@digium.com>
Date: Wed, 19 Mar 2014 14:25:31 +0000 (+0000)
Subject: res_stasis: Fix a bug where the default bridge type was not set.
X-Git-Tag: 13.0.0-beta1~420
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=326153d9495e0b625b4c68b58ec47c65edcabf68;p=thirdparty%2Fasterisk.git

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@410919 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/res/res_stasis.c b/res/res_stasis.c
index cfb1a7af1c..47cca03a5b 100644
--- a/res/res_stasis.c
+++ b/res/res_stasis.c
@@ -588,7 +588,7 @@ static void control_unlink(struct stasis_app_control *control)
 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