diff --git a/src/single_window/remote_peer_window.cpp b/src/single_window/remote_peer_window.cpp index dfa8935..4041101 100644 --- a/src/single_window/remote_peer_window.cpp +++ b/src/single_window/remote_peer_window.cpp @@ -120,15 +120,15 @@ int Render::ConnectTo(const std::string &host_name, const char *password, if (signal_connected_) { if (!props->connection_established_) { if (0 == strcmp(host_name.c_str(), client_id_) && !peer_reserved_) { + std::string client_id = "C-"; + client_id += client_id_; peer_reserved_ = CreatePeer(¶ms_); if (peer_reserved_) { - LOG_INFO("Create peer[reserved] instance successful"); - std::string client_id = "C-"; - client_id += client_id_; + LOG_INFO("[{}] Create peer instance successful", client_id); Init(peer_reserved_, client_id.c_str()); - LOG_INFO("Peer[reserved] init finish"); + LOG_INFO("[{}] Peer init finish", client_id); } else { - LOG_INFO("Create peer[reserved] instance failed"); + LOG_INFO("Create peer [{}] instance failed", client_id); } } diff --git a/src/single_window/render.cpp b/src/single_window/render.cpp index 28a84be..eea810d 100644 --- a/src/single_window/render.cpp +++ b/src/single_window/render.cpp @@ -353,7 +353,7 @@ int Render::CreateConnectionPeer() { Init(peer_, client_id_); LOG_INFO("[{}] Peer init finish", client_id_); } else { - LOG_INFO("Create peer instance failed"); + LOG_INFO("Create peer [{}] instance failed", client_id_); } return 0; @@ -855,12 +855,16 @@ int Render::Run() { props->remember_password_ ? props->remote_password_ : ""); } - LOG_INFO("[{}] Leave connection [{}]", client_id_, it.first); - LeaveConnection(peer_reserved_ ? peer_reserved_ : peer_, - it.first.c_str()); if (peer_reserved_) { - LOG_INFO("Destroy peer[reserved]"); + std::string client_id = "C-"; + client_id += client_id_; + LOG_INFO("[{}] Leave connection [{}]", client_id, it.first); + LeaveConnection(peer_reserved_, it.first.c_str()); + LOG_INFO("Destroy peer [{}]", client_id); DestroyPeer(&peer_reserved_); + } else { + LOG_INFO("[{}] Leave connection [{}]", client_id_, it.first); + LeaveConnection(peer_, it.first.c_str()); } props->streaming_ = false; @@ -1078,7 +1082,7 @@ int Render::Run() { LOG_INFO("[{}] Leave connection [{}]", client_id_, client_id_); LeaveConnection(peer_, client_id_); is_client_mode_ = false; - LOG_INFO("Destroy peer"); + LOG_INFO("Destroy peer [{}]", client_id_); DestroyPeer(&peer_); } diff --git a/thirdparty/projectx b/thirdparty/projectx index b50175f..160ee9f 160000 --- a/thirdparty/projectx +++ b/thirdparty/projectx @@ -1 +1 @@ -Subproject commit b50175f943767ec54f6b6a3a49c36177e1cab861 +Subproject commit 160ee9feef5aaa3c543b8d86af6d9f2f65b5ec41