diff options
| author | Joshua Colp <jcolp@digium.com> | 2009-05-06 17:38:51 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2009-05-06 17:38:51 +0000 |
| commit | 9936f0ca144caa24394a6efccad4ab14189b968c (patch) | |
| tree | d417a6e950509ea14877940c0e0bf3bdd6d3ef4f | |
| parent | 829807cd2c6ccb68fa8cd4304b04d333226d0e80 (diff) | |
Fix a bug where a timer would be created but not acknowledged.
This scenario crept up if chan_iax2 was loaded with no configuration file present.
It would create a timer and tell it to go at an interval but the thread that normally
acknowledges it would not be created because no configuration file was present. The timer
will now be closed if no configuration file is present.
(closes issue #15014)
Reported by: madkins
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@192808 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | channels/chan_iax2.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 33e2431ce..4b5578934 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -12685,6 +12685,9 @@ static int load_module(void) } if (set_config(config, 0) == -1) { + if (timer) { + ast_timer_close(timer); + } return AST_MODULE_LOAD_DECLINE; } |