tmp commit

Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
fufesou 2023-04-01 22:24:42 +08:00
parent 73358502e9
commit 5eedbdb436
2 changed files with 21 additions and 5 deletions

View File

@ -479,9 +479,25 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("identical_file_tip", "Ce fichier est identique à celui du pair."), ("identical_file_tip", "Ce fichier est identique à celui du pair."),
("show_monitors_tip", "Afficher les moniteurs dans la barre d'outils."), ("show_monitors_tip", "Afficher les moniteurs dans la barre d'outils."),
("View Mode", "Mode vue"), ("View Mode", "Mode vue"),
("enter_rustdesk_passwd_tip", "Saisissez le mot de passe RustDesk."),
("remember_rustdesk_passwd_tip", "Se rappeler du mot de passe RustDesk."),
("login_linux_tip", "Se connecter au compte Linux distant"), ("login_linux_tip", "Se connecter au compte Linux distant"),
("login_linux_tooltip_tip", "Vous devez vous connecter à un compte Linux distant pour activer une session de bureau X."), ("verify_rustdesk_password_tip", ""),
("remember_account_tip", ""),
("os_account_desk_tip", ""),
("OS Account", ""),
("session_not_ready_title_tip", ""),
("session_not_ready_text_tip", ""),
("xsession_failed_title_tip", ""),
("xsession_failed_text_tip", ""),
("another_user_login_title_tip", ""),
("another_user_login_text_tip", ""),
("xorg_not_found_title_tip", ""),
("xorg_not_found_text_tip", ""),
("no_desktop_title_tip", ""),
("no_desktop_text_tip", ""),
("session_unready_no_password_title_tip", ""),
("session_unready_no_password_text_tip", ""),
("session_unready_wrong_password_title_tip", ""),
("session_unready_wrong_password_text_tip", ""),
("no_password_access_text_tip", ""),
].iter().cloned().collect(); ].iter().cloned().collect();
} }

View File

@ -942,7 +942,7 @@ impl Connection {
} }
#[cfg(not(any(target_os = "android", target_os = "ios")))] #[cfg(not(any(target_os = "android", target_os = "ios")))]
if self.file_transfer.is_some() { if self.file_transfer.is_some() {
if !crate::platform::is_prelogin() || self.tx_to_cm.send(ipc::Data::Test).is_err() { if crate::platform::is_prelogin() || self.tx_to_cm.send(ipc::Data::Test).is_err() {
username = "".to_owned(); username = "".to_owned();
} }
} }
@ -2190,7 +2190,7 @@ async fn start_ipc(
tx_stream_ready: mpsc::Sender<()>, tx_stream_ready: mpsc::Sender<()>,
) -> ResultType<()> { ) -> ResultType<()> {
loop { loop {
if crate::platform::is_prelogin() { if !crate::platform::is_prelogin() {
break; break;
} }
sleep(1.).await; sleep(1.).await;