From dfd128c817c20081673fd0b82bd2b51f6f90919a Mon Sep 17 00:00:00 2001
From: rustdesk <info@rustdesk.com>
Date: Mon, 7 Mar 2022 22:26:34 +0800
Subject: [PATCH] refactor blank thread exit

---
 src/server/connection.rs | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/server/connection.rs b/src/server/connection.rs
index 529e0d7e5..bb4e6994e 100644
--- a/src/server/connection.rs
+++ b/src/server/connection.rs
@@ -38,7 +38,6 @@ enum MessageInput {
     BlockOff,
     PrivacyOn,
     PrivacyOff,
-    Exit,
 }
 
 pub struct Connection {
@@ -346,7 +345,6 @@ impl Connection {
             conn.on_close(&err.to_string(), false);
         }
 
-        conn.tx_input.send(MessageInput::Exit).ok();
         log::info!("#{} connection loop exited", id);
     }
 
@@ -354,7 +352,7 @@ impl Connection {
         let mut block_input_mode = false;
         let (tx_blank, rx_blank) = std_mpsc::channel();
 
-        let handler_blank = std::thread::spawn(|| Self::handle_blank(rx_blank));
+        std::thread::spawn(|| Self::handle_blank(rx_blank));
 
         loop {
             match receiver.recv_timeout(std::time::Duration::from_millis(500)) {
@@ -398,22 +396,17 @@ impl Connection {
                         }
                         tx_blank.send(MessageInput::PrivacyOff).ok();
                     }
-                    MessageInput::Exit => break,
                 },
-                _ => {
+                Err(err) => {
                     if block_input_mode {
                         let _ = crate::platform::block_input(true);
                     }
+                    if std_mpsc::RecvTimeoutError::Disconnected == err {
+                        break;
+                    }
                 }
             }
         }
-
-        tx_blank.send(MessageInput::Exit).ok();
-        if let Err(_) = handler_blank.join() {
-            log::error!("Failed to join blank thread handler");
-        } else {
-            log::info!("Blank thread exited");
-        }
         log::info!("Input thread exited");
     }
 
@@ -432,13 +425,17 @@ impl Connection {
                     }
                     _ => break,
                 },
-                _ => {
+                Err(err) => {
                     if last_privacy {
                         crate::platform::toggle_blank_screen(true);
                     }
+                    if std_mpsc::RecvTimeoutError::Disconnected == err {
+                        break;
+                    }
                 }
             }
         }
+        log::info!("Blank thread exited");
     }
 
     async fn try_port_forward_loop(