Merged revisions 247770 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ........ r247770 | dvossel | 2010-02-18 15:23:48 -0600 (Thu, 18 Feb 2010) | 9 lines fixes confbridge crash when no timing module is loaded. (closes issue #16471) Reported by: kjotte Patches: M16471.diff uploaded by junky (license 177) Tested by: kjotte, junky ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@247776 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
3b8c09df6a
commit
4e62c51461
|
@ -99,6 +99,9 @@ static int softmix_bridge_create(struct ast_bridge *bridge)
|
|||
/*! \brief Function called when a bridge is destroyed */
|
||||
static int softmix_bridge_destroy(struct ast_bridge *bridge)
|
||||
{
|
||||
if (!bridge->bridge_pvt) {
|
||||
return -1;
|
||||
}
|
||||
ast_timer_close((struct ast_timer *) bridge->bridge_pvt);
|
||||
|
||||
return 0;
|
||||
|
|
Reference in New Issue