From: Russell Bryant <russell@russellbryant.com>
Date: Wed, 21 Feb 2007 20:22:33 +0000 (+0000)
Subject: Simplify the last change to app_meetme, and move the call to dispose_conf()
X-Git-Tag: 1.4.1~54
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bb3aa2ee419b9bac7893e26e6e77d5156a575223;p=thirdparty%2Fasterisk.git

Simplify the last change to app_meetme, and move the call to dispose_conf()
up into the block where we know a conf exists.


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

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index a66ba45d8d..8c919634a7 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -2536,8 +2536,6 @@ static int conf_exec(struct ast_channel *chan, void *data)
 					/* Run the conference */
 					res = conf_run(chan, cnf, confflags.flags, optargs);
 				}
-			}
-			if (cnf) {
 				dispose_conf(cnf);
 				cnf = NULL;
 			}