mod_conference: fix relate nohear (MODAPP-428)

diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c
index 90a4ab356a92be4c64c37900609f8c24392fc9e7..583a0e1e2d44ee24ceb645845aab6bf3f6492e6c 100644 (file)
--- a/src/mod/applications/mod_conference/mod_conference.c
+++ b/src/mod/applications/mod_conference/mod_conference.c
@@ -1244,15 +1244,23 @@ static void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t *thread, v
                                         */
                                        if (conference->relationship_total) {
                                                for (imember = conference->members; imember; imember = imember->next) {
-                                                       conference_relationship_t *rel;
-                                                       for (rel = imember->relationships; rel; rel = rel->next) {
-                                                               if (imember != omember && switch_test_flag(imember, MFLAG_HAS_AUDIO)) {
-                                                                       int16_t *rptr = (int16_t *) imember->frame;
+                                                       if (imember != omember && switch_test_flag(imember, MFLAG_HAS_AUDIO)) {
+                                                               conference_relationship_t *rel;
+                                                               switch_size_t found = 0;
+                                                               int16_t *rptr = (int16_t *) imember->frame;
+                                                               for (rel = imember->relationships; rel; rel = rel->next) {
                                                                        if ((rel->id == omember->id || rel->id == 0) && !switch_test_flag(rel, RFLAG_CAN_SPEAK)) {
                                                                                z -= (int32_t) rptr[x];
+                                                                               found = 1;
+                                                                               break;
                                                                        }
-                                                                       if ((rel->id == imember->id || rel->id == 0) && !switch_test_flag(rel, RFLAG_CAN_HEAR)) {
-                                                                               z -= (int32_t) rptr[x];
+                                                               }
+                                                               if (!found) {
+                                                                       for (rel = omember->relationships; rel; rel = rel->next) {
+                                                                               if ((rel->id == imember->id || rel->id == 0) && !switch_test_flag(rel, RFLAG_CAN_HEAR)) {
+                                                                                       z -= (int32_t) rptr[x];
+                                                                                       break;
+                                                                               }
                                                                        }
                                                                }