Use slightly less map and other confusing code

1 files changed, 5 insertions, 4 deletions

diff --git a/talpid-ipc/src/lib.rs b/talpid-ipc/src/lib.rs
index 3e1e3790df..fd5cde7c63 100644
--- a/talpid-ipc/src/lib.rs
+++ b/talpid-ipc/src/lib.rs
@@ -66,12 +66,13 @@ impl IpcServer {
             .map_err(Error::StartServerError)
             .and_then(|(fut, start, server)| {
                 thread::spawn(move || tokio::run(fut));
-                start
+                if let Some(error) = start
                     .wait()
                     .map_err(|_cancelled| Error::ServerThreadPanicError)?
-                    .map(Err)
-                    .unwrap_or_else(|| Ok(server))
-                    .map_err(Error::IpcServerError)
+                {
+                    return Err(Error::IpcServerError(error));
+                }
+                Ok(server)
             })
             .map(|server| IpcServer {
                 path: path.to_owned(),