weyne/rustdesk
1
0
Fork 0
mirror of https://github.com/weyne85/rustdesk.git synced 2025-10-29 17:00:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

refact linux desktop env

Browse Source 
Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
fufesou
2023-03-28 22:20:15 +08:00
parent 5e79481860
commit 30375a9853
5 changed files with 250 additions and 449 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/server/connection.rs
View File

@@ -1074,18 +1074,19 @@ impl Connection {
fn try_start_desktop(_username: &str, _passsword: &str) -> String {
#[cfg(target_os = "linux")]
if _username.is_empty() {
let desktop = crate::platform::linux_desktop::get_desktop_env();
if desktop.is_ready() {
""
} else {
let username = crate::platform::linux_desktop_manager::get_username();
if username.is_empty() {
LOGIN_MSG_XSESSION_NOT_READY
} else {
""
}
.to_owned()
} else {
match crate::platform::linux_desktop::try_start_x_session(_username, _passsword) {
Ok(desktop) => {
if desktop.is_ready() {
if _username != desktop.username {
match crate::platform::linux_desktop_manager::try_start_x_session(_username, _passsword)
{
Ok((username, x11_ready)) => {
if x11_ready {
if _username != username {
LOGIN_MSG_XSESSION_ANOTHER_USER_READTY.to_owned()
} else {
"".to_owned()