rewind

src/mod/applications/mod_conference/conference_member.c

@@ -1070,7 +1070,7 @@ void conference_member_set_floor_holder(conference_obj_t *conference, conference
 	}
 
 	if (member && conference_utils_member_test_flag(member, MFLAG_DED_VID_LAYER)) {
-		goto end;
+		return;
 	}
 	
 	conference->floor_holder_score_iir = 0;

src/mod/applications/mod_conference/conference_video.c

@@ -2667,25 +2667,10 @@ switch_status_t conference_video_find_layer(conference_obj_t *conference, mcu_ca
 
 void conference_video_next_canvas(conference_member_t *imember)
 {
-	int x = 0, y = 0;
-
-	if (imember->conference->canvas_count < 2) {
-		return;
-	}
-	
-	y = imember->canvas_id;
-
-	for (x = 0; x < imember->conference->canvas_count; x++) {
-		if (y == (int)imember->conference->canvas_count - 1) {
-			y = 0;
-		} else {
-			y++;
-		}
-
-		if (imember->conference->canvases[y]->video_count < imember->conference->canvases[y]->total_layers) {
-			imember->canvas_id = y;
-			break;
-		}
+	if (imember->canvas_id == (int)imember->conference->canvas_count - 1) {
+		imember->canvas_id = 0;
+	} else {
+		imember->canvas_id++;
 	}
 
 	imember->layer_timeout = DEFAULT_LAYER_TIMEOUT;