summaryrefslogtreecommitdiffstats
path: root/apppbx.cpp
diff options
context:
space:
mode:
authorSuper User2007-10-01 09:54:51 +0200
committerSuper User2007-10-01 09:54:51 +0200
commitc01315204bbfc920f9cb674835226e9f71ab4089 (patch)
tree4b6e1ffcdab18478a50b008c84719c8ef81eaf39 /apppbx.cpp
parentaudio recording fix by Xuan (diff)
downloadlcr-c01315204bbfc920f9cb674835226e9f71ab4089.tar.gz
lcr-c01315204bbfc920f9cb674835226e9f71ab4089.tar.xz
lcr-c01315204bbfc920f9cb674835226e9f71ab4089.zip
some small conference jingle fixes
changed description of interface in settings.
Diffstat (limited to 'apppbx.cpp')
-rw-r--r--apppbx.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/apppbx.cpp b/apppbx.cpp
index b7a8357..6641b31 100644
--- a/apppbx.cpp
+++ b/apppbx.cpp
@@ -3443,10 +3443,13 @@ void EndpointAppPBX::join_notify(struct port_list *portlist, int message_type, u
/* unhold if */
if (new_state!=NOTIFY_STATE_HOLD && new_state!=NOTIFY_STATE_SUSPEND)
{
- while(portlist)
+ if (!strcmp(e_tone, "hold")) // don't interrupt other tones
{
- set_tone(portlist, "");
- portlist = portlist->next;
+ while(portlist)
+ {
+ set_tone(portlist, "");
+ portlist = portlist->next;
+ }
}
portlist = ea_endpoint->ep_portlist;
e_hold = 0;