diff options
| author | David Vossel <dvossel@digium.com> | 2010-02-18 21:23:48 +0000 |
|---|---|---|
| committer | David Vossel <dvossel@digium.com> | 2010-02-18 21:23:48 +0000 |
| commit | eb31f8b082a0b1e24a4127f20287f3ec00e71ee9 (patch) | |
| tree | e351eec7c6144660c6931a21ab0850b4a8b85d39 /bridges/bridge_softmix.c | |
| parent | 48134df6555247769f493b1ba5c293b7ba366983 (diff) | |
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: https://origsvn.digium.com/svn/asterisk/trunk@247770 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'bridges/bridge_softmix.c')
| -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 3cddc42e4..69d13a2b6 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; |