Merge tag 'ignore-openvpn-event-send-error'

1 files changed, 4 insertions, 15 deletions

diff --git a/talpid-core/src/tunnel_state_machine/connecting_state.rs b/talpid-core/src/tunnel_state_machine/connecting_state.rs
index d8bc5fea92..bcf1c422e4 100644
--- a/talpid-core/src/tunnel_state_machine/connecting_state.rs
+++ b/talpid-core/src/tunnel_state_machine/connecting_state.rs
@@ -1,13 +1,11 @@
 use std::ffi::OsString;
 use std::path::{Path, PathBuf};
-use std::sync::Mutex;
 use std::thread;
 use std::time::{Duration, Instant};
 
 use error_chain::ChainedError;
-use futures::sink::Wait;
 use futures::sync::{mpsc, oneshot};
-use futures::{Async, Future, Sink, Stream};
+use futures::{Async, Future, Stream};
 
 use talpid_types::net::{TunnelEndpoint, TunnelEndpointData};
 use talpid_types::tunnel::BlockReason;
@@ -72,8 +70,7 @@ impl ConnectingState {
         resource_dir: &Path,
     ) -> Result<Self> {
         let (event_tx, event_rx) = mpsc::unbounded();
-        let monitor =
-            Self::spawn_tunnel_monitor(&parameters, log_dir, resource_dir, event_tx.wait())?;
+        let monitor = Self::spawn_tunnel_monitor(&parameters, log_dir, resource_dir, event_tx)?;
         let close_handle = monitor.close_handle();
         let tunnel_close_event = Self::spawn_tunnel_monitor_wait_thread(monitor);
 
@@ -89,18 +86,10 @@ impl ConnectingState {
         parameters: &TunnelParameters,
         log_dir: &Option<PathBuf>,
         resource_dir: &Path,
-        events: Wait<mpsc::UnboundedSender<TunnelEvent>>,
+        events: mpsc::UnboundedSender<TunnelEvent>,
     ) -> Result<TunnelMonitor> {
-        let event_tx = Mutex::new(events);
         let on_tunnel_event = move |event| {
-            let send_result = event_tx
-                .lock()
-                .expect("A thread panicked while sending a tunnel event")
-                .send(event);
-
-            if send_result.is_err() {
-                warn!("Tunnel state machine stopped before tunnel event was received");
-            }
+            let _ = events.unbounded_send(event);
         };
         let log_file = Self::prepare_tunnel_log_file(&parameters, log_dir)?;