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

remove wait prelogin in service

Browse Source 
Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
fufesou 2023-04-01 10:57:40 +08:00
parent 0718f00eb2
commit de485ca3a4
2 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/hbb_common/src/platform/linux.rs
View File

@ -40,12 +40,6 @@ pub fn is_desktop_wayland() -> bool {
get_display_server() == DISPLAY_SERVER_WAYLAND get_display_server() == DISPLAY_SERVER_WAYLAND
} }
#[inline]
pub fn is_x11_wayland() -> bool {
let ds = get_display_server();
ds == DISPLAY_SERVER_X11 || ds == DISPLAY_SERVER_WAYLAND
}
#[inline] #[inline]
pub fn is_x11_or_headless() -> bool { pub fn is_x11_or_headless() -> bool {
!is_desktop_wayland() !is_desktop_wayland()

18
src/server/service.rs
View File

@ -189,20 +189,6 @@ impl<T: Subscriber + From<ConnInner>> ServiceTmpl<T> {
} }
} }
#[inline]
fn wait_prelogin_or_x11gdm(&self) {
#[cfg(target_os = "linux")]
while self.active() {
if crate::platform::linux::is_prelogin() {
break;
}
if crate::platform::linux::is_x11_wayland() {
break;
}
thread::sleep(time::Duration::from_millis(300));
}
}
pub fn repeat<S, F>(&self, interval_ms: u64, callback: F) pub fn repeat<S, F>(&self, interval_ms: u64, callback: F)
where where
F: 'static + FnMut(Self, &mut S) -> ResultType<()> + Send, F: 'static + FnMut(Self, &mut S) -> ResultType<()> + Send,
@ -212,8 +198,6 @@ impl<T: Subscriber + From<ConnInner>> ServiceTmpl<T> {
let mut callback = callback; let mut callback = callback;
let sp = self.clone(); let sp = self.clone();
let thread = thread::spawn(move || { let thread = thread::spawn(move || {
sp.wait_prelogin_or_x11gdm();
let mut state = S::default(); let mut state = S::default();
let mut may_reset = false; let mut may_reset = false;
while sp.active() { while sp.active() {
@ -248,8 +232,6 @@ impl<T: Subscriber + From<ConnInner>> ServiceTmpl<T> {
let sp = self.clone(); let sp = self.clone();
let mut callback = callback; let mut callback = callback;
let thread = thread::spawn(move || { let thread = thread::spawn(move || {
sp.wait_prelogin_or_x11gdm();
let mut error_timeout = HIBERNATE_TIMEOUT; let mut error_timeout = HIBERNATE_TIMEOUT;
while sp.active() { while sp.active() {
if sp.has_subscribes() { if sp.has_subscribes() {