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

send SwitchDisplay using the same channel with VideoFrame

Browse Source 
Signed-off-by: 21pages <pages21@163.com>
This commit is contained in:
21pages 2023-04-28 16:35:54 +08:00
parent 2b8a98da06
commit ca7487350f
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/server/connection.rs
View File

@ -165,18 +165,23 @@ impl Subscriber for ConnInner {
#[inline] #[inline]
fn send(&mut self, msg: Arc<Message>) { fn send(&mut self, msg: Arc<Message>) {
match &msg.union { // Send SwitchDisplay on the same channel as VideoFrame to avoid send order problems.
Some(message::Union::VideoFrame(_)) => { let tx_by_video = match &msg.union {
self.tx_video.as_mut().map(|tx| { Some(message::Union::VideoFrame(_)) => true,
allow_err!(tx.send((Instant::now(), msg))); Some(message::Union::Misc(misc)) => match &misc.union {
}); Some(misc::Union::SwitchDisplay(_)) => true,
} _ => false,
_ => { },
self.tx.as_mut().map(|tx| { _ => false,
allow_err!(tx.send((Instant::now(), msg))); };
}); let tx = if tx_by_video {
} self.tx_video.as_mut()
} } else {
self.tx.as_mut()
};
tx.map(|tx| {
allow_err!(tx.send((Instant::now(), msg)));
});
} }
} }