aboutsummaryrefslogtreecommitdiffstats
path: root/channels
diff options
context:
space:
mode:
authorfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2009-05-06 17:38:51 +0000
committerfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2009-05-06 17:38:51 +0000
commit40b81e6709fbea6da25fb828d9e3752706cd3f92 (patch)
treed417a6e950509ea14877940c0e0bf3bdd6d3ef4f /channels
parentfe8d8008efba984440087adb01f09c402a58c2a7 (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: http://svn.digium.com/svn/asterisk/trunk@192808 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_iax2.c3
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;
}