YangWX/crossdesk
1
0
Fork 0
mirror of https://github.com/kunkundi/crossdesk.git synced 2025-10-26 20:25:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

[fix] fix crash when signal server close the connection actively

Browse Source
This commit is contained in:
dijunkun
2024-09-04 17:03:40 +08:00
parent 8ae9513104
commit 1292018f51
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/single_window/render.cpp
View File

@@ -437,8 +437,7 @@ int Render::Run() {
// Main loop // Main loop
while (!exit_) { while (!exit_) {
if (SignalStatus::SignalConnected == signal_status_ && if (SignalStatus::SignalConnected == signal_status_ &&
!is_create_connection_ && password_inited_ && !is_create_connection_ && password_inited_) {
"Failed" != connection_status_str_) {
LOG_INFO("Connected with signal server, create p2p connection"); LOG_INFO("Connected with signal server, create p2p connection");
is_create_connection_ = is_create_connection_ =
CreateConnection(peer_, client_id_, password_saved_) ? false : true; CreateConnection(peer_, client_id_, password_saved_) ? false : true;

4
src/single_window/render_callback_func.cpp
View File

@@ -174,6 +174,10 @@ void Render::OnSignalStatusCb(SignalStatus status, void *user_data) {
} else if (SignalStatus::SignalReconnecting == status) { } else if (SignalStatus::SignalReconnecting == status) {
render->signal_status_str_ = "SignalReconnecting"; render->signal_status_str_ = "SignalReconnecting";
render->signal_connected_ = false; render->signal_connected_ = false;
} else if (SignalStatus::SignalServerClosed == status) {
render->signal_status_str_ = "SignalServerClosed";
render->signal_connected_ = false;
render->is_create_connection_ = false;
} }
} }

2
thirdparty/projectx vendored

Submodule thirdparty/projectx updated: d78dc4585f...d285d7971a