summaryrefslogtreecommitdiffstats
path: root/joinpbx.cpp
diff options
context:
space:
mode:
authorSuper User2007-09-10 14:32:59 +0200
committerSuper User2007-09-10 14:32:59 +0200
commit541572c18c3c4476da5dbec48b313e613562b438 (patch)
treeca73102364ccc27f1a55f9d9837ba48ef628f264 /joinpbx.cpp
parentjust backup. (partyline join/release jingle not tested yet, no sound yet) (diff)
downloadlcr-541572c18c3c4476da5dbec48b313e613562b438.tar.gz
lcr-541572c18c3c4476da5dbec48b313e613562b438.tar.xz
lcr-541572c18c3c4476da5dbec48b313e613562b438.zip
added partyline join and leave jingle option
Diffstat (limited to 'joinpbx.cpp')
-rw-r--r--joinpbx.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/joinpbx.cpp b/joinpbx.cpp
index 792fc4b..750705f 100644
--- a/joinpbx.cpp
+++ b/joinpbx.cpp
@@ -418,7 +418,7 @@ void JoinPBX::bridge(void)
relation->next->tx_state = notify_state_change(j_serial, relation->next->epoint_id, relation->next->tx_state, relation->rx_state);
} else
/* one member in a join, so we put her on hold */
- if (relations==1 || numconnect==1)
+ if ((relations==1 || numconnect==1) && !j_partyline_jingle)
{
PDEBUG(DEBUG_JOIN, "join%d 1 member or only 1 connected, put on hold\n");
relation = j_relation;