From 7c23fd307349c2d436dbcadc9cff9d4099187a42 Mon Sep 17 00:00:00 2001 From: RustDesk <71636191+rustdesk@users.noreply.github.com> Date: Sun, 9 Aug 2026 18:40:50 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"fix(linux):=20bound=20the=20xrandr=20?= =?UTF-8?q?call=20in=20the=20wayland=20primary-display=20look=E2=80=A6"=20?= =?UTF-8?q?(#15806)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 291507664278f0df273c31f58b9318ff44b28a18. --- libs/scrap/src/wayland/display.rs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libs/scrap/src/wayland/display.rs b/libs/scrap/src/wayland/display.rs index e3c5ebede..bed90fd76 100644 --- a/libs/scrap/src/wayland/display.rs +++ b/libs/scrap/src/wayland/display.rs @@ -76,9 +76,7 @@ fn run_with_timeout( // 2. The distro may not have xrandr installed by default. // 3. xrandr may not report "primary" in its output. eg. openSUSE Leap 15.6 KDE Plasma. fn try_xrandr_primary() -> Option { - // Bounded like its two siblings below: this runs inside the held `DISPLAYS` guard, and from a - // service with no DISPLAY and no session bus, where an X client can block indefinitely. - let output = run_with_timeout("xrandr", &[], COMMAND_TIMEOUT, "xrandr")?; + let output = Command::new("xrandr").output().ok()?; if !output.status.success() { return None; }