diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-08 16:52:52 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-08 16:52:52 +0000 |
| commit | a3e4a532932d76ae6fadd496e31aa69c79067777 (patch) | |
| tree | c3c1cb5f5502e31594891f702af793f63d48ddbe /res | |
| parent | 8db11fe01c390a606f82d8798397adf8c439779f (diff) | |
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.
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@187047 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_musiconhold.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index a2f0da3c7..a05279130 100644 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -1510,9 +1510,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); |