aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorautomerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b>2007-07-13 20:29:46 +0000
committerautomerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b>2007-07-13 20:29:46 +0000
commit281582987022ff9fbede2fc1f9c06d214da23f3a (patch)
tree61367f57ddd25ef29771bfb8a40c84778aa6a243 /res
parent563d0c398c3ae668b629297cda6c9409b9150fb3 (diff)
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@75106 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
-rw-r--r--res/res_musiconhold.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index efdd90bc4..f4e3a8167 100644
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -660,8 +660,10 @@ static struct mohdata *mohalloc(struct mohclass *cl)
flags = fcntl(moh->pipe[1], F_GETFL);
fcntl(moh->pipe[1], F_SETFL, flags | O_NONBLOCK);
moh->parent = cl;
+ ast_mutex_lock(&moh_lock);
moh->next = cl->members;
cl->members = moh;
+ ast_mutex_unlock(&moh_lock);
return moh;
}