From f5bd40d925f99ef0278ceaed627192afe4743c28 Mon Sep 17 00:00:00 2001
From: Russell Bryant <russell@russellbryant.com>
Date: Wed, 21 Feb 2007 20:23:03 +0000
Subject: [PATCH] Merged revisions 55951 via svnmerge from
 https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r55951 | russell | 2007-02-21 14:22:33 -0600 (Wed, 21 Feb 2007) | 3 lines

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/trunk@55952 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 apps/app_meetme.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 7a394f20dd..5cdad064e6 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -2545,8 +2545,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;
 			}