diff --git a/src/bc_protocol.rs b/src/bc_protocol.rs index 9e0bad2..09b78aa 100644 --- a/src/bc_protocol.rs +++ b/src/bc_protocol.rs @@ -50,7 +50,10 @@ pub enum Error { DroppedConnection(#[error(source)] std::sync::mpsc::RecvError), #[error(display = "Timeout")] - Timeout(#[error(source)] std::sync::mpsc::RecvTimeoutError), + Timeout, + + #[error(display = "Dropped connection")] + TimeoutDisconnected, #[error(display = "Credential error")] AuthFailed, @@ -62,6 +65,15 @@ pub enum Error { Other(&'static str), } +impl<'a> From for Error { + fn from(k: std::sync::mpsc::RecvTimeoutError) -> Self { + match k { + std::sync::mpsc::RecvTimeoutError::Timeout => Error::Timeout, + std::sync::mpsc::RecvTimeoutError::Disconnected => Error::TimeoutDisconnected, + } + } +} + impl Drop for BcCamera { fn drop(&mut self) { self.disconnect(); diff --git a/src/bc_protocol/connection.rs b/src/bc_protocol/connection.rs index 7003b6a..16683ef 100644 --- a/src/bc_protocol/connection.rs +++ b/src/bc_protocol/connection.rs @@ -55,7 +55,12 @@ impl BcConnection { let rx_thread = std::thread::spawn(move || { let mut context = BcContext::new(); - while BcConnection::poll(&mut context, &conn, &mut subs).is_ok() {} + let mut result; + while { + result = BcConnection::poll(&mut context, &conn, &mut subs); + result.is_ok() + } {} + error!("Deserialization error: {:?}", result.unwrap_err()); }); Ok(BcConnection {