hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5884 from fufesou/fix/sciter_reconnect_state

Browse Source 
fix, sciter, reconnect, check thread running before the state
This commit is contained in:
RustDesk 2023-10-02 20:40:15 +08:00 committed by GitHub
commit b02f169764
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ui_session_interface.rs
View File

@ -888,11 +888,13 @@ impl<T: InvokeUiSession> Session<T> {
// 2. If the connection is established, send `Data::Close`. // 2. If the connection is established, send `Data::Close`.
// 3. If the connection is disconnected, do nothing. // 3. If the connection is disconnected, do nothing.
let mut connection_round_state_lock = self.connection_round_state.lock().unwrap(); let mut connection_round_state_lock = self.connection_round_state.lock().unwrap();
if self.thread.lock().unwrap().is_some() {
match connection_round_state_lock.state { match connection_round_state_lock.state {
ConnectionState::Connecting => return, ConnectionState::Connecting => return,
ConnectionState::Connected => self.send(Data::Close), ConnectionState::Connected => self.send(Data::Close),
ConnectionState::Disconnected => {} ConnectionState::Disconnected => {}
} }
}
let round = connection_round_state_lock.new_round(); let round = connection_round_state_lock.new_round();
drop(connection_round_state_lock); drop(connection_round_state_lock);