diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-04-06 22:09:54 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-04-06 22:09:54 +0000 |
| commit | 2f33168ff02604c2194748b59388f9160a74747e (patch) | |
| tree | 83c1af272b0ce436ba8dc3b76c921e5629950d07 /apps | |
| parent | 7771e798909f36a66d267d2d350414b27a9a9885 (diff) | |
small fix... don't try to check conference details if it couldn't be created or found
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2@18088 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_meetme.c | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 0eb185e74..5c9efe99f 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -1,7 +1,7 @@ /* * Asterisk -- An open source telephony toolkit. * - * Copyright (C) 1999 - 2005, Digium, Inc. + * Copyright (C) 1999 - 2006, Digium, Inc. * * Mark Spencer <markster@digium.com> * @@ -1697,17 +1697,19 @@ static struct ast_conference *find_conf(struct ast_channel *chan, char *confno, dynamic_pin[0] = '\0'; } - if (confflags && !cnf->chan && - !ast_test_flag(confflags, CONFFLAG_QUIET) && - ast_test_flag(confflags, CONFFLAG_INTROUSER)) { - ast_log(LOG_WARNING, "No Zap channel available for conference, user introduction disabled (is chan_zap loaded?)\n"); - ast_clear_flag(confflags, CONFFLAG_INTROUSER); - } - - if (confflags && !cnf->chan && - ast_test_flag(confflags, CONFFLAG_RECORDCONF)) { - ast_log(LOG_WARNING, "No Zap channel available for conference, conference recording disabled (is chan_zap loaded?)\n"); - ast_clear_flag(confflags, CONFFLAG_RECORDCONF); + if (cnf) { + if (confflags && !cnf->chan && + !ast_test_flag(confflags, CONFFLAG_QUIET) && + ast_test_flag(confflags, CONFFLAG_INTROUSER)) { + ast_log(LOG_WARNING, "No Zap channel available for conference, user introduction disabled (is chan_zap loaded?)\n"); + ast_clear_flag(confflags, CONFFLAG_INTROUSER); + } + + if (confflags && !cnf->chan && + ast_test_flag(confflags, CONFFLAG_RECORDCONF)) { + ast_log(LOG_WARNING, "No Zap channel available for conference, conference recording disabled (is chan_zap loaded?)\n"); + ast_clear_flag(confflags, CONFFLAG_RECORDCONF); + } } return cnf; |