Merged revisions 187045 via svnmerge from
authorMark Michelson <mmichelson@digium.com>
Wed, 8 Apr 2009 16:52:20 +0000 (16:52 +0000)
committerMark Michelson <mmichelson@digium.com>
Wed, 8 Apr 2009 16:52:20 +0000 (16:52 +0000)
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.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@187046 65c4cc65-6c06-0410-ace0-fbb531ad65f3

res/res_musiconhold.c

index c6cfb96..39d475f 100644 (file)
@@ -1505,9 +1505,9 @@ static int load_moh_classes(int reload)
                }
 
                /* 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);