From b3e3f6151d537a009dbbb8ef695c6fe13fd45527 Mon Sep 17 00:00:00 2001 From: rustdesk Date: Sat, 25 Dec 2021 01:07:41 +0800 Subject: [PATCH] get last env instead of the first one avoid problem when just switch from wayland to xorg --- src/platform/linux.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/platform/linux.rs b/src/platform/linux.rs index 7368d3c04..bdc5510d1 100644 --- a/src/platform/linux.rs +++ b/src/platform/linux.rs @@ -644,7 +644,7 @@ fn get_env_tries(name: &str, uid: &str, n: usize) -> String { } fn get_env(name: &str, uid: &str) -> String { - let cmd = format!("ps -u {} -o pid= | xargs -I__ cat /proc/__/environ 2>/dev/null | tr '\\0' '\\n' | grep -m1 '^{}=' | sed 's/{}=//g'", uid, name, name); + let cmd = format!("ps -u {} -o pid= | xargs -I__ cat /proc/__/environ 2>/dev/null | tr '\\0' '\\n' | grep '^{}=' | tail -1 | sed 's/{}=//g'", uid, name, name); log::debug!("Run: {}", &cmd); if let Ok(Some(x)) = run_cmds(cmd) { x.trim_end().to_string()