From 68afb89b997e04b3efc401b5789e4de6692476ad Mon Sep 17 00:00:00 2001
From: rustdesk <info@rustdesk.com>
Date: Sun, 21 Jan 2024 15:18:25 +0800
Subject: [PATCH] a quick fix for 2fa

---
 src/client.rs            | 1 -
 src/server/connection.rs | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/client.rs b/src/client.rs
index e8167b6c5..637ddf529 100644
--- a/src/client.rs
+++ b/src/client.rs
@@ -2564,7 +2564,6 @@ pub fn handle_login_error(
         interface.msgbox("re-input-password", err, "Do you want to enter again?", "");
         true
     } else if err == LOGIN_MSG_2FA_WRONG || err == REQUIRE_2FA {
-        lc.write().unwrap().password = Default::default();
         interface.msgbox("input-2fa", err, "", "");
         true
     } else if LOGIN_ERROR_MAP.contains_key(err) {
diff --git a/src/server/connection.rs b/src/server/connection.rs
index 1f0685d9b..42b963593 100644
--- a/src/server/connection.rs
+++ b/src/server/connection.rs
@@ -1625,8 +1625,8 @@ impl Connection {
                     #[cfg(all(target_os = "linux", feature = "linux_headless"))]
                     #[cfg(not(any(feature = "flatpak", feature = "appimage")))]
                     self.linux_headless_handle.wait_desktop_cm_ready().await;
-                    self.try_start_cm(lr.my_id.clone(), lr.my_name.clone(), true);
                     self.send_logon_response().await;
+                    self.try_start_cm(lr.my_id.clone(), lr.my_name.clone(), self.authorized);
                     if self.port_forward_socket.is_some() {
                         return false;
                     }
@@ -1666,7 +1666,7 @@ impl Connection {
                         #[cfg(not(any(feature = "flatpak", feature = "appimage")))]
                         self.linux_headless_handle.wait_desktop_cm_ready().await;
                         self.send_logon_response().await;
-                        self.try_start_cm(lr.my_id, lr.my_name, true);
+                        self.try_start_cm(lr.my_id, lr.my_name, self.authorized);
                         if self.port_forward_socket.is_some() {
                             return false;
                         }
@@ -1746,8 +1746,8 @@ impl Connection {
                     if let Some((_instant, uuid_old)) = uuid_old {
                         if uuid == uuid_old {
                             self.from_switch = true;
-                            self.try_start_cm(lr.my_id.clone(), lr.my_name.clone(), true);
                             self.send_logon_response().await;
+                            self.try_start_cm(lr.my_id.clone(), lr.my_name.clone(), self.authorized);
                             #[cfg(not(any(target_os = "android", target_os = "ios")))]
                             self.try_start_cm_ipc();
                         }