diff options
| author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-02-18 21:25:00 +0000 |
|---|---|---|
| committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-02-18 21:25:00 +0000 |
| commit | 4e62c514612ab552bf6f95451759015acd886a3e (patch) | |
| tree | ac5591ae451a184c6ed086f4d8351252ba3f2b45 | |
| parent | 3b8c09df6a428ea9ed13adf0b24cf82a479fa2a2 (diff) | |
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
| -rw-r--r-- | bridges/bridge_softmix.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/bridges/bridge_softmix.c b/bridges/bridge_softmix.c index a98038660..8142e534e 100644 --- a/bridges/bridge_softmix.c +++ b/bridges/bridge_softmix.c @@ -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; |