mirror/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2024-12-12 18:29:10 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

set WAYLAND_DISPLAY env

Browse Source 
Signed-off-by: Sahil Yeole <sahilyeole93@gmail.com>
This commit is contained in:
Sahil Yeole 2023-12-01 05:13:03 +05:30
parent 83faf6025b
commit 7ac49287df
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/platform/linux.rs
View File

@ -213,6 +213,9 @@ fn try_start_server_(desktop: Option<&Desktop>) -> ResultType<Option<Child>> {
if !desktop.xauth.is_empty() { if !desktop.xauth.is_empty() {
envs.push(("XAUTHORITY", desktop.xauth.clone())); envs.push(("XAUTHORITY", desktop.xauth.clone()));
} }
if !desktop.wl_display.is_empty() {
envs.push(("WAYLAND_DISPLAY", desktop.wl_display.clone()));
}
run_as_user( run_as_user(
vec!["--server"], vec!["--server"],
Some((desktop.uid.clone(), desktop.username.clone())), Some((desktop.uid.clone(), desktop.username.clone())),
@ -936,6 +939,7 @@ mod desktop {
pub display: String, pub display: String,
pub xauth: String, pub xauth: String,
pub is_rustdesk_subprocess: bool, pub is_rustdesk_subprocess: bool,
pub wl_display: String,
} }
impl Desktop { impl Desktop {
@ -966,6 +970,7 @@ mod desktop {
for proc in display_proc { for proc in display_proc {
self.display = get_env("DISPLAY", &self.uid, proc); self.display = get_env("DISPLAY", &self.uid, proc);
self.xauth = get_env("XAUTHORITY", &self.uid, proc); self.xauth = get_env("XAUTHORITY", &self.uid, proc);
self.wl_display = get_env("WAYLAND_DISPLAY", &self.uid, proc);
if !self.display.is_empty() && !self.xauth.is_empty() { if !self.display.is_empty() && !self.xauth.is_empty() {
break; break;
} }