[svn-commits] dvossel: branch 1.6.2 r247776 - in /branches/1.6.2: ./ bridges/bridge_softmix.c

[SVN commits to the Digium repositories]

Author: dvossel
Date: Thu Feb 18 15:25:00 2010
New Revision: 247776

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=247776
Log:
Merged revisions 247770 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r247770 | dvossel | 2010-02-18 15:23:48 -0600 (Thu, 18 Feb 2010) | 9 lines
  
  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
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/bridges/bridge_softmix.c

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

Modified: branches/1.6.2/bridges/bridge_softmix.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/bridges/bridge_softmix.c?view=diff&rev=247776&r1=247775&r2=247776
==============================================================================
--- branches/1.6.2/bridges/bridge_softmix.c (original)
+++ branches/1.6.2/bridges/bridge_softmix.c Thu Feb 18 15:25:00 2010
@@ -99,6 +99,9 @@
 /*! \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;