diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-21 20:18:16 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-21 20:18:16 +0000 |
| commit | 7dd4d11b3e6c49d532ebe442bb048644d801ef3a (patch) | |
| tree | c4a1485d19b655e1a8c271b6802d2e041240f523 /apps | |
| parent | 5f1271f72882326837dc92620233550061228866 (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: http://svn.digium.com/svn/asterisk/trunk@55950 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
| -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); |