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 a66ba45d8d1420cf3a3b7e9532adc2567b69349d..8c919634a7d1fbed9502fd90fb788b5be446605f 100644 (file)
--- 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;
                        }