diff --git a/src/platform/windows.rs b/src/platform/windows.rs index 4fc134914..074b3ccd1 100644 --- a/src/platform/windows.rs +++ b/src/platform/windows.rs @@ -546,7 +546,7 @@ async fn launch_server(session_id: DWORD, close_first: bool) -> ResultType> = Arc::new(Mutex::new(Instant::now())); + static ref SUPPRESS: Arc> = Arc::new(Mutex::new(Instant::now())); } pub fn desktop_changed() -> bool { @@ -617,7 +617,7 @@ pub fn try_change_desktop() -> bool { if inputDesktopSelected() == FALSE { let res = selectInputDesktop() == TRUE; if !res { - let mut s = SUPRESS.lock().unwrap(); + let mut s = SUPPRESS.lock().unwrap(); if s.elapsed() > std::time::Duration::from_secs(3) { log::error!("Failed to switch desktop: {}", get_error()); *s = Instant::now(); diff --git a/src/server/connection.rs b/src/server/connection.rs index 0ed2338d5..e8eae4fe1 100644 --- a/src/server/connection.rs +++ b/src/server/connection.rs @@ -120,13 +120,13 @@ impl Connection { return; } if !conn.keyboard { - conn.send_permisssion(Permission::Keyboard, false).await; + conn.send_permission(Permission::Keyboard, false).await; } if !conn.clipboard { - conn.send_permisssion(Permission::Clipboard, false).await; + conn.send_permission(Permission::Clipboard, false).await; } if !conn.audio { - conn.send_permisssion(Permission::Audio, false).await; + conn.send_permission(Permission::Audio, false).await; } let mut test_delay_timer = time::interval_at(Instant::now() + TEST_DELAY_TIMEOUT, TEST_DELAY_TIMEOUT); @@ -164,7 +164,7 @@ impl Connection { log::info!("Change permission {} -> {}", name, enabled); if &name == "keyboard" { conn.keyboard = enabled; - conn.send_permisssion(Permission::Keyboard, enabled).await; + conn.send_permission(Permission::Keyboard, enabled).await; if let Some(s) = conn.server.upgrade() { s.write().unwrap().subscribe( NAME_CURSOR, @@ -172,7 +172,7 @@ impl Connection { } } else if &name == "clipboard" { conn.clipboard = enabled; - conn.send_permisssion(Permission::Clipboard, enabled).await; + conn.send_permission(Permission::Clipboard, enabled).await; if let Some(s) = conn.server.upgrade() { s.write().unwrap().subscribe( super::clipboard_service::NAME, @@ -180,7 +180,7 @@ impl Connection { } } else if &name == "audio" { conn.audio = enabled; - conn.send_permisssion(Permission::Audio, enabled).await; + conn.send_permission(Permission::Audio, enabled).await; if let Some(s) = conn.server.upgrade() { s.write().unwrap().subscribe( super::audio_service::NAME, @@ -331,7 +331,7 @@ impl Connection { } } - async fn send_permisssion(&mut self, permission: Permission, enabled: bool) { + async fn send_permission(&mut self, permission: Permission, enabled: bool) { let mut misc = Misc::new(); misc.set_permission_info(PermissionInfo { permission: permission.into(), diff --git a/src/server/service.rs b/src/server/service.rs index b60f5a8d4..150cccb75 100644 --- a/src/server/service.rs +++ b/src/server/service.rs @@ -34,7 +34,7 @@ pub trait Reset { pub struct ServiceTmpl>(Arc>>); pub struct ServiceSwap>(ServiceTmpl); pub type GenericService = ServiceTmpl; -pub const HIBERATE_TIMEOUT: u64 = 30; +pub const HIBERNATE_TIMEOUT: u64 = 30; pub const MAX_ERROR_TIMEOUT: u64 = 1_000; impl> ServiceInner { @@ -191,7 +191,7 @@ impl> ServiceTmpl { let sp = self.clone(); let mut callback = callback; let thread = thread::spawn(move || { - let mut error_timeout = HIBERATE_TIMEOUT; + let mut error_timeout = HIBERNATE_TIMEOUT; while sp.active() { if sp.has_subscribes() { log::debug!("Enter {} service inner loop", sp.name()); @@ -199,7 +199,7 @@ impl> ServiceTmpl { if let Err(err) = callback(sp.clone()) { log::error!("Error of {} service: {}", sp.name(), err); if tm.elapsed() > time::Duration::from_millis(MAX_ERROR_TIMEOUT) { - error_timeout = HIBERATE_TIMEOUT; + error_timeout = HIBERNATE_TIMEOUT; } else { error_timeout *= 2; } @@ -213,7 +213,7 @@ impl> ServiceTmpl { log::debug!("Exit {} service inner loop", sp.name()); } } - thread::sleep(time::Duration::from_millis(HIBERATE_TIMEOUT)); + thread::sleep(time::Duration::from_millis(HIBERNATE_TIMEOUT)); } }); self.0.write().unwrap().handle = Some(thread);