diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-08 16:53:26 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-08 16:53:26 +0000 |
| commit | a978f3c376886d468ebed8fc4f0a2c041e593529 (patch) | |
| tree | 4f5981be3cedbb31613f381af87df9b56960ccd5 /res | |
| parent | 1fd970b2fb43312c63063dde76e215a40a8e7598 (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.1@187048 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 0a7e05683..fc946291c 100644 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -1494,9 +1494,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); |