konevsa/rustdesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

https://github.com/rustdesk/rustdesk/issues/73

Browse Source
This commit is contained in:
rustdesk 2021-06-14 13:16:20 +08:00
parent da4669366b
commit a830922dea
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/platform/linux.rs
View File

@ -326,13 +326,32 @@ fn get_value_of_seat0(i: usize) -> String {
} }
} }
} }
// some case, there is no seat0 https://github.com/rustdesk/rustdesk/issues/73
if let Ok(output) = std::process::Command::new("loginctl").output() {
for line in String::from_utf8_lossy(&output.stdout).lines() {
if let Some(sid) = line.split_whitespace().nth(0) {
let d = get_display_server_of_session(sid);
if is_active(sid) && d != "tty" {
if let Some(uid) = line.split_whitespace().nth(i) {
return uid.to_owned();
}
}
}
}
}
return "".to_owned(); return "".to_owned();
} }
pub fn get_display_server() -> String { pub fn get_display_server() -> String {
let session = get_value_of_seat0(0); let session = get_value_of_seat0(0);
get_display_server_of_session(&session)
}
fn get_display_server_of_session(session: &str) -> String {
if let Ok(output) = std::process::Command::new("loginctl") if let Ok(output) = std::process::Command::new("loginctl")
.args(vec!["show-session", "-p", "Type", &session]) .args(vec!["show-session", "-p", "Type", session])
.output() .output()
{ {
String::from_utf8_lossy(&output.stdout) String::from_utf8_lossy(&output.stdout)