]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Fix a small logical error when loading moh classes.
authorMark Michelson <mmichelson@digium.com>
Wed, 8 Apr 2009 16:52:03 +0000 (16:52 +0000)
committerMark Michelson <mmichelson@digium.com>
Wed, 8 Apr 2009 16:52:03 +0000 (16:52 +0000)
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/branches/1.4@187045 65c4cc65-6c06-0410-ace0-fbb531ad65f3

res/res_musiconhold.c

index 95fe16ec2a0f3dc166db3d967c51a96615c65f8a..33f258dc0a6248c2ed05598b7b131b366afa56ad 100644 (file)
@@ -1219,9 +1219,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++;
+               }
        }