[asterisk-commits] mmichelson: branch 1.6.1 r187048 - in /branches/1.6.1: ./ res/res_musiconhold.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Wed Apr  8 11:53:26 2009
New Revision: 187048

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

................
  r187046 | mmichelson | 2009-04-08 11:52:20 -0500 (Wed, 08 Apr 2009) | 16 lines
  
  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:
    branches/1.6.1/   (props changed)
    branches/1.6.1/res/res_musiconhold.c

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

Modified: branches/1.6.1/res/res_musiconhold.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/res/res_musiconhold.c?view=diff&rev=187048&r1=187047&r2=187048
==============================================================================
--- branches/1.6.1/res/res_musiconhold.c (original)
+++ branches/1.6.1/res/res_musiconhold.c Wed Apr  8 11:53:26 2009
@@ -1494,9 +1494,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);