From afea9b2edd4becf66bdc6d40a0cb0dbe29267524 Mon Sep 17 00:00:00 2001
From: Ryan Dahl <ry@tinyclouds.org>
Date: Thu, 5 Mar 2020 20:01:08 -0500
Subject: [PATCH] fix: call unwatch when dropping FsEventsResource (#4266)

---
 cli/ops/fs_events.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/cli/ops/fs_events.rs b/cli/ops/fs_events.rs
index 9603c3b90d..8a64348728 100644
--- a/cli/ops/fs_events.rs
+++ b/cli/ops/fs_events.rs
@@ -76,7 +76,9 @@ pub fn op_fs_events_open(
     Watcher::new_immediate(move |res: Result<NotifyEvent, NotifyError>| {
       let res2 = res.map(FsEvent::from).map_err(ErrBox::from);
       let mut sender = sender.lock().unwrap();
-      futures::executor::block_on(sender.send(res2)).expect("fs events error");
+      // Ignore result, if send failed it means that watcher was already closed,
+      // but not all messages have been flushed.
+      let _ = futures::executor::block_on(sender.send(res2));
     })
     .map_err(ErrBox::from)?;
   let recursive_mode = if args.recursive {