提交 b16a13c0 authored 作者: Seven Du's avatar Seven Du

fix crash, no all members has channel

上级 4d2272ca
...@@ -1608,7 +1608,7 @@ static void conference_set_video_floor_holder(conference_obj_t *conference, conf ...@@ -1608,7 +1608,7 @@ static void conference_set_video_floor_holder(conference_obj_t *conference, conf
conference_member_t *imember; conference_member_t *imember;
for (imember = conference->members; imember; imember = imember->next) { for (imember = conference->members; imember; imember = imember->next) {
if (imember != conference->video_floor_holder && switch_channel_test_flag(imember->channel, CF_VIDEO)) { if (imember != conference->video_floor_holder && imember->channel && switch_channel_test_flag(imember->channel, CF_VIDEO)) {
member = imember; member = imember;
break; break;
} }
...@@ -1659,7 +1659,8 @@ static void conference_set_floor_holder(conference_obj_t *conference, conference ...@@ -1659,7 +1659,8 @@ static void conference_set_floor_holder(conference_obj_t *conference, conference
int old_id = 0; int old_id = 0;
if (!switch_test_flag(conference, CFLAG_VIDEO_BRIDGE) && if (!switch_test_flag(conference, CFLAG_VIDEO_BRIDGE) &&
((conference->video_floor_holder && !member) || (member && switch_channel_test_flag(member->channel, CF_VIDEO)))) { ((conference->video_floor_holder && !member) ||
(member && member->channel && switch_channel_test_flag(member->channel, CF_VIDEO)))) {
conference_set_video_floor_holder(conference, member, SWITCH_FALSE); conference_set_video_floor_holder(conference, member, SWITCH_FALSE);
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论