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

found one blank cm, still not find reason

Browse Source
This commit is contained in:
rustdesk 2022-04-29 19:40:53 +08:00
parent e2c9b78254
commit 1235edb239
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ui/cm.rs
View File

@ -359,6 +359,7 @@ async fn start_ipc(cm: ConnectionManager) {
while let Some(result) = incoming.next().await { while let Some(result) = incoming.next().await {
match result { match result {
Ok(stream) => { Ok(stream) => {
log::debug!("Got new connection");
let mut stream = Connection::new(stream); let mut stream = Connection::new(stream);
let cm = cm.clone(); let cm = cm.clone();
let tx_file = tx_file.clone(); let tx_file = tx_file.clone();
@ -377,6 +378,7 @@ async fn start_ipc(cm: ConnectionManager) {
Ok(Some(data)) => { Ok(Some(data)) => {
match data { match data {
Data::Login{id, is_file_transfer, port_forward, peer_id, name, authorized, keyboard, clipboard, audio, file, file_transfer_enabled} => { Data::Login{id, is_file_transfer, port_forward, peer_id, name, authorized, keyboard, clipboard, audio, file, file_transfer_enabled} => {
log::debug!("conn_id: {}", id);
conn_id = id; conn_id = id;
tx_file.send(ClipboardFileData::Enable((id, file_transfer_enabled))).ok(); tx_file.send(ClipboardFileData::Enable((id, file_transfer_enabled))).ok();
cm.add_connection(id, is_file_transfer, port_forward, peer_id, name, authorized, keyboard, clipboard, audio, file, tx.clone()); cm.add_connection(id, is_file_transfer, port_forward, peer_id, name, authorized, keyboard, clipboard, audio, file, tx.clone());
@ -395,7 +397,9 @@ async fn start_ipc(cm: ConnectionManager) {
} }
} }
Some(data) = rx.recv() => { Some(data) = rx.recv() => {
allow_err!(stream.send(&data).await); if stream.send(&data).await.is_err() {
break;
}
} }
} }
} }

1
src/ui/cm.tis
View File

@ -290,6 +290,7 @@ handler.removeConnection = function(id) {
connections.map(function(c, idx) { connections.map(function(c, idx) {
if (c.id == id) i = idx; if (c.id == id) i = idx;
}); });
if (i < 0) return;
connections.splice(i, 1); connections.splice(i, 1);
if (connections.length == 0) { if (connections.length == 0) {
handler.exit(); handler.exit();