[asterisk-commits] mmichelson: trunk r187046 - in /trunk: ./ res/res_musiconhold.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Wed Apr  8 11:52:20 2009
New Revision: 187046

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=187046
Log:
Merged revisions 187045 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r187045 | mmichelson | 2009-04-08 11:52:03 -0500 (Wed, 08 Apr 2009) | 10 lines
  
  Fix a small logical error when loading moh classes.
  
  We were unconditionally incrementing the number of mohclasses
  registered. However, we should actually only increment if the
  call to moh_register was successful.
  
  While this probably has never caused problems, I noticed it
  and decided to fix it anyway.
........

Modified:
    trunk/   (props changed)
    trunk/res/res_musiconhold.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/res/res_musiconhold.c
URL: http://svn.digium.com/svn-view/asterisk/trunk/res/res_musiconhold.c?view=diff&rev=187046&r1=187045&r2=187046
==============================================================================
--- trunk/res/res_musiconhold.c (original)
+++ trunk/res/res_musiconhold.c Wed Apr  8 11:52:20 2009
@@ -1505,9 +1505,9 @@
 		}
 
 		/* Don't leak a class when it's already registered */
-		moh_register(class, reload);
-
-		numclasses++;
+		if (!moh_register(class, reload)) {
+			numclasses++;
+		}
 	}
 
 	ast_config_destroy(cfg);