From a6e5c98723812c9fa19eeeb6dcafcc3c7685c8ef Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Thu, 6 Apr 2006 22:09:54 +0000 Subject: [PATCH] small fix... don't try to check conference details if it couldn't be created or found git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@18088 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_meetme.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 0eb185e748..5c9efe99fc 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 * @@ -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;