diff --git a/src/single_window/render.cpp b/src/single_window/render.cpp index 83a5dd2..267a5fc 100644 --- a/src/single_window/render.cpp +++ b/src/single_window/render.cpp @@ -466,9 +466,10 @@ int Render::CreateConnectionPeer() { params_.turn_server_port = 3478; params_.turn_server_username = "dijunkun"; params_.turn_server_password = "dijunkunpw"; - params_.tls_cert_path = - cert_path_.empty() ? "certs/crossdesk.cn_root.crt" : cert_path_.c_str(); - params_.log_path = dll_log_path_.empty() ? "logs" : dll_log_path_.c_str(); + params_.tls_cert_path = std::filesystem::exists(cert_path_) + ? cert_path_.c_str() + : "certs/crossdesk.cn_root.crt"; + params_.log_path = dll_log_path_.c_str(); params_.hardware_acceleration = config_center_.IsHardwareVideoCodec(); params_.av1_encoding = config_center_.GetVideoEncodeFormat() == ConfigCenter::VIDEO_ENCODE_FORMAT::AV1 @@ -925,7 +926,7 @@ int Render::Run() { } void Render::InitializeLogger() { - if (!exec_log_path_.empty()) { + if (std::filesystem::exists(exec_log_path_)) { InitLogger(exec_log_path_); } else { InitLogger("logs"); diff --git a/src/single_window/render_callback_func.cpp b/src/single_window/render_callback_func.cpp index 3d0c75f..ddc3ae6 100644 --- a/src/single_window/render_callback_func.cpp +++ b/src/single_window/render_callback_func.cpp @@ -496,7 +496,7 @@ void Render::NetStatusReport(const char *client_id, size_t client_id_size, memset(&render->client_id_with_password_, 0, sizeof(render->client_id_with_password_)); - strncpy(render->client_id_with_password_, id.c_str(), + strncpy(render->client_id_with_password_, client_id, sizeof(render->client_id_with_password_) - 1); render->client_id_with_password_[sizeof(render->client_id_with_password_) - 1] = '\0'; diff --git a/thirdparty/minirtc b/thirdparty/minirtc index bbb572d..2f4b928 160000 --- a/thirdparty/minirtc +++ b/thirdparty/minirtc @@ -1 +1 @@ -Subproject commit bbb572dcecdebaf3f953c3a839a4dd021e524bf2 +Subproject commit 2f4b92864975d926de51d2d9c571151b24ad9bdc