diff options
| author | Russell Bryant <russell@russellbryant.com> | 2007-02-21 20:23:03 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2007-02-21 20:23:03 +0000 |
| commit | f5bd40d925f99ef0278ceaed627192afe4743c28 (patch) | |
| tree | fd1fcb53159dcc864477c2b1f90f12971209211c /apps | |
| parent | 80e8ca4f9bafddd7e3c6a4ebd2ee31562406213e (diff) | |
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
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_meetme.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 7a394f20d..5cdad064e 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; } |