aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorjeremy <jeremy@f38db490-d61c-443f-a65b-d21fe96a405b>2004-01-11 06:31:42 +0000
committerjeremy <jeremy@f38db490-d61c-443f-a65b-d21fe96a405b>2004-01-11 06:31:42 +0000
commit762c7ec910539f90f697315018fbdbae2fc9d31a (patch)
tree275f0d6bf9776741ee887843b07963719c00c342 /apps
parent5321668e8b886dfc19f3aded332212c9037acadd (diff)
fix dynamic conference. Bug #743 take two
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@1933 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-rwxr-xr-xapps/app_meetme.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 289cd1d5b..83e7ba01b 100755
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -626,21 +626,26 @@ static int conf_exec(struct ast_channel *chan, void *data)
struct ast_conference *cnf;
int confflags = 0;
int dynamic = 0;
- char *info, *inflags = NULL, *inpin = NULL;
+ char *notdata, *info, *inflags = NULL, *inpin = NULL;
if (!data || !strlen(data)) {
allowretry = 1;
- data = "";
+ notdata = "";
+ } else {
+ notdata = data;
}
LOCAL_USER_ADD(u);
if (chan->_state != AST_STATE_UP)
ast_answer(chan);
- info = ast_strdupa((char *)data);
+ info = ast_strdupa((char *)notdata);
if (info) {
char *tmp = strsep(&info, "|");
strncpy(confno, tmp, sizeof(confno));
+ if (strlen(confno) == 0) {
+ allowretry = 1;
+ }
}
if (info)
inflags = strsep(&info, "|");