From 8d1254cf14b69f545c9cefa026c5eeb0e7dd3e7c Mon Sep 17 00:00:00 2001 From: rustdesk Date: Mon, 5 Dec 2022 00:26:13 +0800 Subject: [PATCH] fix is_login_wayland --- flutter/pubspec.lock | 4 ++-- src/platform/linux.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/flutter/pubspec.lock b/flutter/pubspec.lock index 9a4d3d77b..a24f73954 100644 --- a/flutter/pubspec.lock +++ b/flutter/pubspec.lock @@ -257,8 +257,8 @@ packages: dependency: "direct main" description: path: "." - ref: cb086219bd4760a95a483cb14c1791d2a39ca5a0 - resolved-ref: cb086219bd4760a95a483cb14c1791d2a39ca5a0 + ref: "82f9eab81cb2c7bfb938def7a1b399a6279bbc75" + resolved-ref: "82f9eab81cb2c7bfb938def7a1b399a6279bbc75" url: "https://github.com/Kingtous/rustdesk_desktop_multi_window" source: git version: "0.1.0" diff --git a/src/platform/linux.rs b/src/platform/linux.rs index c8abe432e..82d6592db 100644 --- a/src/platform/linux.rs +++ b/src/platform/linux.rs @@ -416,9 +416,9 @@ fn get_display() -> String { pub fn is_login_wayland() -> bool { if let Ok(contents) = std::fs::read_to_string("/etc/gdm3/custom.conf") { - contents.contains("#WaylandEnable=false") + contents.contains("#WaylandEnable=false") || contents.contains("WaylandEnable=true") } else if let Ok(contents) = std::fs::read_to_string("/etc/gdm/custom.conf") { - contents.contains("#WaylandEnable=false") + contents.contains("#WaylandEnable=false") || contents.contains("WaylandEnable=true") } else { false }