]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Fix a bug where a timer would be created but not acknowledged.
authorJoshua Colp <jcolp@digium.com>
Wed, 6 May 2009 17:38:51 +0000 (17:38 +0000)
committerJoshua Colp <jcolp@digium.com>
Wed, 6 May 2009 17:38:51 +0000 (17:38 +0000)
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

channels/chan_iax2.c

index 33e2431ce8207cd71e0c0b7b3587994d2b1cb644..4b55789341213cad8727e9fcb5b1954d311db9be 100644 (file)
@@ -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;
        }