From b37e08a20278d9455a84bc99aaeb74a59fb316b4 Mon Sep 17 00:00:00 2001 From: dijunkun Date: Thu, 8 Aug 2024 15:26:21 +0800 Subject: [PATCH] [fix] fix client id empty error when run the program firstly --- src/single_window/render_callback_func.cpp | 11 ++++++----- thirdparty/projectx | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/single_window/render_callback_func.cpp b/src/single_window/render_callback_func.cpp index 1539c6b..2bfebbe 100644 --- a/src/single_window/render_callback_func.cpp +++ b/src/single_window/render_callback_func.cpp @@ -231,15 +231,16 @@ void Render::OnConnectionStatusCb(ConnectionStatus status, void *user_data) { } } -void Render::NetStatusReport(int TransmissionId, TraversalMode mode, +void Render::NetStatusReport(int client_id, TraversalMode mode, const unsigned short send, const unsigned short receive, void *user_data) { Render *render = (Render *)user_data; - if (TransmissionId != 0 && 0 == strcmp(render->client_id_, "")) { - std::string client_id = std::to_string(TransmissionId); - strncpy(render->client_id_, client_id.c_str(), sizeof(client_id)); + if (client_id != 0 && 0 == strcmp(render->client_id_, "")) { + std::string client_id_s = std::to_string(client_id); + strncpy(render->client_id_, client_id_s.c_str(), + sizeof(render->client_id_)); + LOG_INFO("Use client id [{}] and save id into cache file", client_id_s); render->SaveSettingsIntoCacheFile(); - LOG_INFO("Transmission id: [{}]", TransmissionId); } if (mode != TraversalMode::UnknownMode) { LOG_INFO("Net mode: [{}]", int(mode)); diff --git a/thirdparty/projectx b/thirdparty/projectx index dd8ab05..a308094 160000 --- a/thirdparty/projectx +++ b/thirdparty/projectx @@ -1 +1 @@ -Subproject commit dd8ab05d0f92186aa55cb4fd6f6e706fd70100a2 +Subproject commit a308094fbda69d4e3fc9b3b4de7c4ae938c3b4dc