Merge pull request #4226 from 21pages/fix

send SwitchDisplay using the same channel with VideoFrame

src/server/connection.rs

@@ -165,18 +165,23 @@ impl Subscriber for ConnInner {
 
     #[inline]
     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)));
+        });
     }
 }