summaryrefslogtreecommitdiffstats
path: root/src/fzf.rs
diff options
context:
space:
mode:
authorFly me to the moon <git@bigly.dog>2021-08-13 02:49:16 -0700
committerFly me to the moon <git@bigly.dog>2021-08-13 02:49:16 -0700
commit1e723261850f7a90491b7c8bf8c182b517bb16c1 (patch)
tree7f8f58e62f0e0d01b65c55e71d0c143a608acc39 /src/fzf.rs
parentf44bd341a29b48febfaa9da3983bafc9bc89381d (diff)
fm
Diffstat (limited to 'src/fzf.rs')
-rw-r--r--src/fzf.rs12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/fzf.rs b/src/fzf.rs
index 646c527..7faec34 100644
--- a/src/fzf.rs
+++ b/src/fzf.rs
@@ -90,11 +90,11 @@ fn run_fzf(abort: &Abort, cmd: &SubprocessCommand, stream: Receiver<String>) ->
_ = on_abort.recv() => {
match child.kill().await {
Err(err) => {
- abort.send(err);
+ let _ = abort.send(err);
},
_ => {
if let Err(err) = reset_term().await {
- abort.send(err)
+ let _ = abort.send(err)
}
}
}
@@ -102,11 +102,11 @@ fn run_fzf(abort: &Abort, cmd: &SubprocessCommand, stream: Receiver<String>) ->
}
});
- spawn(async move {
- if let Err(err) = try_join(handle_child, handle_in).await {
- abort.send(Box::new(err));
+ if let Err(err) = try_join(handle_child, handle_in).await {
+ if !err.is_cancelled() {
+ let _ = abort.send(Fail::Join);
}
- })
+ }
}
}
})