Wait differently in ChildMonitor to stop panics

1 files changed, 4 insertions, 2 deletions

diff --git a/talpid_core/src/process/monitor.rs b/talpid_core/src/process/monitor.rs
index 6914d8d821..1568d80615 100644
--- a/talpid_core/src/process/monitor.rs
+++ b/talpid_core/src/process/monitor.rs
@@ -29,7 +29,9 @@ impl ChildMonitor {
     /// guaranteed to fire before this method returns.
     pub fn wait(&mut self) -> io::Result<&process::Output> {
         if let Some(thread) = self.thread.take() {
-            let _ = thread.join();
+            if let Err(e) = thread.join() {
+                error!("Panic in the on_exit callback in ChildMonitor: {:?}", e);
+            }
         }
         self.child.wait()
     }
@@ -44,7 +46,7 @@ impl ChildMonitor {
 impl Drop for ChildMonitor {
     fn drop(&mut self) {
         let _ = self.kill();
-        let _ = self.wait();
+        let _ = self.child.wait();
     }
 }