kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 03:50:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

When the specified class isn't found, properly fall back to the channel's music

Browse Source 
class or the default.
(issue #10123, reported by blitzrage, patches from juggie, qwell, and me)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@74165 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2007-07-09 21:00:17 +00:00
parent 29da454042
commit 319b105e17
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
res/res_musiconhold.c
View File

@@ -636,6 +636,7 @@ static struct mohclass *get_mohbyname(char *name)
return moh;
moh = moh->next;
}
ast_log(LOG_WARNING, "Music on Hold class '%s' not found\n", name);
return NULL;
}
@@ -908,20 +909,19 @@ static void local_ast_moh_cleanup(struct ast_channel *chan)
static int local_ast_moh_start(struct ast_channel *chan, char *class)
{
struct mohclass *mohclass;
struct mohclass *mohclass = NULL;
if (ast_strlen_zero(class))
class = chan->musicclass;
if (ast_strlen_zero(class))
class = "default";
ast_mutex_lock(&moh_lock);
mohclass = get_mohbyname(class);
if (!ast_strlen_zero(class))
mohclass = get_mohbyname(class);
if (!mohclass && !ast_strlen_zero(chan->musicclass))
mohclass = get_mohbyname(chan->musicclass);
if (!mohclass)
mohclass = get_mohbyname("default");
ast_mutex_unlock(&moh_lock);
if (!mohclass) {
ast_log(LOG_WARNING, "No class: %s\n", (char *)class);
if (!mohclass)
return -1;
}
ast_set_flag(chan, AST_FLAG_MOH);
if (mohclass->total_files) {