mirror of
https://github.com/rustdesk/rustdesk.git
synced 2026-11-13 06:42:18 +00:00
Merge branch 'master' into master
This commit is contained in:
63 files changed
+1609
-717
No files matched your search
@@ -492,7 +492,7 @@ impl Connection {
|
||||
res = self.stream.next() => {
|
||||
if let Some(res) = res {
|
||||
last_recv_time = Instant::now();
|
||||
timeout(SEND_TIMEOUT_OTHER, forward.send(res?.into())).await??;
|
||||
timeout(SEND_TIMEOUT_OTHER, forward.send(res?)).await??;
|
||||
} else {
|
||||
bail!("Stream reset by the peer");
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user