diff options
| author | Joshua Colp <jcolp@digium.com> | 2007-02-21 20:18:16 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2007-02-21 20:18:16 +0000 |
| commit | 80e8ca4f9bafddd7e3c6a4ebd2ee31562406213e (patch) | |
| tree | c4a1485d19b655e1a8c271b6802d2e041240f523 /apps/app_meetme.c | |
| parent | 5030e056322b3c689d74832e4185a6aa0e6c58e6 (diff) | |
Merged revisions 55949 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r55949 | file | 2007-02-21 15:16:34 -0500 (Wed, 21 Feb 2007) | 2 lines
Only dispose of the conference if one was created.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@55950 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_meetme.c')
| -rw-r--r-- | apps/app_meetme.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 502cb94f1..7a394f20d 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -2546,8 +2546,10 @@ static int conf_exec(struct ast_channel *chan, void *data) res = conf_run(chan, cnf, confflags.flags, optargs); } } - dispose_conf(cnf); - cnf = NULL; + if (cnf) { + dispose_conf(cnf); + cnf = NULL; + } } } while (allowretry); |