Merged revisions 55951 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Wed, 21 Feb 2007 20:23:03 +0000 (20:23 +0000)
committerRussell Bryant <russell@russellbryant.com>
Wed, 21 Feb 2007 20:23:03 +0000 (20:23 +0000)
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

index 7a394f2..5cdad06 100644 (file)
@@ -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;
                        }