From a94052a24a15ac112d7a91ff0e6cbffc385c8080 Mon Sep 17 00:00:00 2001 From: fufesou Date: Thu, 23 Mar 2023 18:01:27 +0800 Subject: [PATCH] ignore seat0 on gdm Signed-off-by: fufesou --- libs/hbb_common/src/platform/linux.rs | 2 +- src/platform/linux_desktop.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/hbb_common/src/platform/linux.rs b/libs/hbb_common/src/platform/linux.rs index 1d826ea97..cf1cf6da5 100644 --- a/libs/hbb_common/src/platform/linux.rs +++ b/libs/hbb_common/src/platform/linux.rs @@ -135,7 +135,7 @@ pub fn get_values_of_seat0_with_gdm_wayland(indices: &[usize]) -> Vec { fn _get_values_of_seat0(indices: &[usize], ignore_gdm_wayland: bool) -> Vec { if let Ok(output) = run_loginctl(None) { for line in String::from_utf8_lossy(&output.stdout).lines() { - if line.contains("seat0") { + if !line.contains("gdm") && line.contains("seat0") { if let Some(sid) = line.split_whitespace().next() { if is_active(sid) { if ignore_gdm_wayland { diff --git a/src/platform/linux_desktop.rs b/src/platform/linux_desktop.rs index bf9f465d0..0d25b3743 100644 --- a/src/platform/linux_desktop.rs +++ b/src/platform/linux_desktop.rs @@ -237,7 +237,7 @@ impl DesktopEnv { fn get_env_seat0(&mut self) -> ResultType { let output = Command::new("loginctl").output()?; for line in String::from_utf8_lossy(&output.stdout).lines() { - if line.contains("seat0") { + if !line.contains("gdm") && line.contains("seat0") { if let Some(sid) = line.split_whitespace().nth(0) { if Self::is_active(sid)? { if let Some(uid) = line.split_whitespace().nth(1) {