fix is_login_wayland

This commit is contained in:
rustdesk 2022-12-05 00:26:13 +08:00
parent b798e7415d
commit 8d1254cf14
2 changed files with 4 additions and 4 deletions

View File

@ -257,8 +257,8 @@ packages:
dependency: "direct main" dependency: "direct main"
description: description:
path: "." path: "."
ref: cb086219bd4760a95a483cb14c1791d2a39ca5a0 ref: "82f9eab81cb2c7bfb938def7a1b399a6279bbc75"
resolved-ref: cb086219bd4760a95a483cb14c1791d2a39ca5a0 resolved-ref: "82f9eab81cb2c7bfb938def7a1b399a6279bbc75"
url: "https://github.com/Kingtous/rustdesk_desktop_multi_window" url: "https://github.com/Kingtous/rustdesk_desktop_multi_window"
source: git source: git
version: "0.1.0" version: "0.1.0"

View File

@ -416,9 +416,9 @@ fn get_display() -> String {
pub fn is_login_wayland() -> bool { pub fn is_login_wayland() -> bool {
if let Ok(contents) = std::fs::read_to_string("/etc/gdm3/custom.conf") { 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") { } 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 { } else {
false false
} }