[svn-commits] file: branch 1.6.1 r192809 - in /branches/1.6.1: ./ channels/chan_iax2.c

[SVN commits to the Digium repositories]

Author: file
Date: Wed May  6 12:39:53 2009
New Revision: 192809

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=192809
Log:
Merged revisions 192808 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r192808 | file | 2009-05-06 14:38:51 -0300 (Wed, 06 May 2009) | 10 lines
  
  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
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_iax2.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/channels/chan_iax2.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/channels/chan_iax2.c?view=diff&rev=192809&r1=192808&r2=192809
==============================================================================
--- branches/1.6.1/channels/chan_iax2.c (original)
+++ branches/1.6.1/channels/chan_iax2.c Wed May  6 12:39:53 2009
@@ -12473,6 +12473,9 @@
 	}
 
 	if (set_config(config, 0) == -1) {
+		if (timer) {
+			ast_timer_close(timer);
+		}
 		return AST_MODULE_LOAD_DECLINE;
 	}