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
This commit is contained in:
Joshua Colp
2007-02-21 20:18:16 +00:00
parent 5030e05632
commit 80e8ca4f9b

View File

@@ -2546,9 +2546,11 @@ static int conf_exec(struct ast_channel *chan, void *data)
res = conf_run(chan, cnf, confflags.flags, optargs);
}
}
if (cnf) {
dispose_conf(cnf);
cnf = NULL;
}
}
} while (allowretry);
if (cnf)