[asterisk-commits] branch 1.2 r18088 - /branches/1.2/apps/app_meetme.c

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Thu Apr  6 17:09:54 2006
New Revision: 18088

URL: http://svn.digium.com/view/asterisk?rev=18088&view=rev
Log:
small fix... don't try to check conference details if it couldn't be created or found

Modified:
    branches/1.2/apps/app_meetme.c

Modified: branches/1.2/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/branches/1.2/apps/app_meetme.c?rev=18088&r1=18087&r2=18088&view=diff
==============================================================================
--- branches/1.2/apps/app_meetme.c (original)
+++ branches/1.2/apps/app_meetme.c Thu Apr  6 17:09:54 2006
@@ -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 at digium.com>
  *
@@ -1697,17 +1697,19 @@
 			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;