summaryrefslogtreecommitdiffstats
path: root/joinpbx.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 /joinpbx.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 'joinpbx.cpp')
-rw-r--r--joinpbx.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/joinpbx.cpp b/joinpbx.cpp
index 76e547a..d0c8b1d 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) && !j_partyline_jingle)
+ 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;
@@ -1045,6 +1045,12 @@ void JoinPBX::play_jingle(int in)
struct message *message;
relation = j_relation;
+
+ if (!relation)
+ return;
+ if (!relation->next)
+ return;
+
while(relation)
{
message = message_create(j_serial, relation->epoint_id, JOIN_TO_EPOINT, MESSAGE_TONE);