From: Russell Bryant <russell@russellbryant.com>
Date: Wed, 5 Jan 2005 05:37:01 +0000 (+0000)
Subject: change option to be consistent (old option still works, too) (bug #3163)
X-Git-Tag: 1.0.11.1~294
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f9eedef7eecf49ed20453a966e5ace12f369e89b;p=thirdparty%2Fasterisk.git

change option to be consistent (old option still works, too) (bug #3163)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/v1-0@4669 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_queue.c b/apps/app_queue.c
index 8ee8d6489d..f48bd963d1 100755
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -1831,7 +1831,7 @@ static void reload_queues(void)
 								q->members = cur;
 							prev = cur;
 						}
-					} else if (!strcasecmp(var->name, "music")) {
+					} else if (!strcasecmp(var->name, "music") || !strcasecmp(var->name, "musiconhold")) {
 						strncpy(q->moh, var->value, sizeof(q->moh) - 1);
 					} else if (!strcasecmp(var->name, "announce")) {
 						strncpy(q->announce, var->value, sizeof(q->announce) - 1);
diff --git a/configs/queues.conf.sample b/configs/queues.conf.sample
index e6e5445313..3a682d1e1d 100755
--- a/configs/queues.conf.sample
+++ b/configs/queues.conf.sample
@@ -17,10 +17,10 @@
 ;
 ; A sample call queue
 ;
-; Music sets which musiconhold applies for this particular
-; call queue
+; Musiconhold sets which music applies for this particular
+; call queue (configure classes in musiconhold.conf)
 ;
-;music = default
+;musiconhold = default
 ;
 ; An announcement may be specified which is played for the member as
 ; soon as they answer a call, typically to indicate to them which queue