YangWX/crossdesk
1
0
Fork 0
mirror of https://github.com/kunkundi/crossdesk.git synced 2025-12-17 20:47:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

[fix] fix dead lock during peer init

Browse Source
This commit is contained in:
dijunkun
2025-11-28 09:32:21 +08:00
parent 3d8249bffa
commit 5d9a0a3ea5
1 changed files with 35 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/gui/panels/remote_peer_panel.cpp
View File

@@ -153,6 +153,10 @@ int Render::ConnectTo(const std::string& remote_id, const char* password,
shared_lock.unlock(); shared_lock.unlock();
if (!exists) { if (!exists) {
PeerPtr* peer_to_init = nullptr;
std::string local_id;
{
std::unique_lock unique_lock(client_properties_mutex_); std::unique_lock unique_lock(client_properties_mutex_);
if (client_properties_.find(remote_id) == client_properties_.end()) { if (client_properties_.find(remote_id) == client_properties_.end()) {
client_properties_[remote_id] = client_properties_[remote_id] =
@@ -175,17 +179,18 @@ int Render::ConnectTo(const std::string& remote_id, const char* password,
AddAudioStream(props->peer_, props->audio_label_.c_str()); AddAudioStream(props->peer_, props->audio_label_.c_str());
AddDataStream(props->peer_, props->data_label_.c_str()); AddDataStream(props->peer_, props->data_label_.c_str());
if (props->peer_) { props->connection_status_ = ConnectionStatus::Connecting;
LOG_INFO("[{}] Create peer instance successful", props->local_id_);
Init(props->peer_); peer_to_init = props->peer_;
LOG_INFO("[{}] Peer init finish", props->local_id_); local_id = props->local_id_;
} else { }
LOG_INFO("Create peer [{}] instance failed", props->local_id_);
} }
props->connection_status_ = ConnectionStatus::Connecting; if (peer_to_init) {
LOG_INFO("[{}] Create peer instance successful", local_id);
Init(peer_to_init);
LOG_INFO("[{}] Peer init finish", local_id);
} }
unique_lock.unlock();
} }
int ret = -1; int ret = -1;