moparisthebest/rusty-keys
1
0
Fork 0
Code Issues Pull Requests Releases 3 Wiki Activity

fix comments and order of operations in input_device
All checks were successful
moparisthebest/rusty-keys/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Travis Burtrum 2021-09-24 00:13:14 -04:00
parent 877a35861a
commit a454b2a2a1
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/linux/device/input_device.rs
View File

@ -124,9 +124,10 @@ impl InputDevice {
pub fn epoll_del(&mut self) -> Result<&mut Self> { pub fn epoll_del(&mut self) -> Result<&mut Self> {
if let Some(epoll_fd) = self.epoll_fd { if let Some(epoll_fd) = self.epoll_fd {
// set this to None first, if we end up returning an Err early, we can't do anything else anyway...
self.epoll_fd = None;
let empty_event = epoll::Event::new(epoll::Events::empty(), 0); let empty_event = epoll::Event::new(epoll::Events::empty(), 0);
epoll::ctl(epoll_fd, EPOLL_CTL_DEL, self.device_file.as_raw_fd(), empty_event)?; epoll::ctl(epoll_fd, EPOLL_CTL_DEL, self.device_file.as_raw_fd(), empty_event)?;
self.epoll_fd = None;
} }
Ok(self) Ok(self)
} }
@ -134,8 +135,8 @@ impl InputDevice {
impl Drop for InputDevice { impl Drop for InputDevice {
fn drop(&mut self) { fn drop(&mut self) {
// todo: only release if grabbed // ignore any errors here, what could we do anyhow?
self.release().ok(); // ignore any errors here, what could we do anyhow? self.release().ok();
self.epoll_del().ok(); self.epoll_del().ok();
} }
} }