tdlight-team/tdlight
tdlight-team/tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Allow to join already joined group call.

Browse Source
This commit is contained in:
levlam 2021-02-24 14:58:02 +03:00
parent 2dd85f92d8
commit 37adbece28
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
td/telegram/GroupCallManager.cpp
View File

@ -500,7 +500,8 @@ void GroupCallManager::on_check_group_call_is_joined_timeout(GroupCallId group_c
auto *group_call = get_group_call(input_group_call_id);
CHECK(group_call != nullptr && group_call->is_inited);
if (!group_call->is_joined || check_group_call_is_joined_timeout_.has_timeout(group_call_id.get())) {
if (!group_call->is_joined || pending_join_requests_.count(input_group_call_id) != 0 ||
check_group_call_is_joined_timeout_.has_timeout(group_call_id.get())) {
return;
}
@ -846,7 +847,8 @@ void GroupCallManager::finish_check_group_call_is_joined(InputGroupCallId input_
auto *group_call = get_group_call(input_group_call_id);
CHECK(group_call != nullptr && group_call->is_inited);
if (!group_call->is_joined || check_group_call_is_joined_timeout_.has_timeout(group_call->group_call_id.get()) ||
if (!group_call->is_joined || pending_join_requests_.count(input_group_call_id) != 0 ||
check_group_call_is_joined_timeout_.has_timeout(group_call->group_call_id.get()) ||
group_call->audio_source != audio_source) {
return;
}
@ -1472,10 +1474,6 @@ void GroupCallManager::join_group_call(GroupCallId group_call_id,
auto *group_call = get_group_call(input_group_call_id);
CHECK(group_call != nullptr);
if (group_call->is_joined && !group_call->is_being_left) {
CHECK(group_call->is_inited);
return promise.set_error(Status::Error(400, "Group call is already joined"));
}
if (group_call->is_inited && !group_call->is_active) {
return promise.set_error(Status::Error(400, "Group call is finished"));
}