7b11e9a · helix · git.iko.soy

on master help sign in

fix erroneous write sender close

7b11e9aSkyler Hawthorne4 years ago

helix-view/src/document.rs+11−1

@@ -13,6 +13,7 @@ use std::future::Future;

13use std::path::{Path, PathBuf};

14use std::str::FromStr;

15use std::sync::Arc;

16+use tokio::sync::mpsc::error::TryRecvError;

16use tokio::sync::mpsc::{UnboundedReceiver, UnboundedSender};

17use tokio::sync::mpsc::{UnboundedReceiver, UnboundedSender};

18use tokio::sync::Mutex;

19use tokio::sync::Mutex;

@@ -662,7 +663,16 @@ impl Document {

662 let save_req = if block {

663 let save_req = if block {

663 rx.recv().await

664 rx.recv().await

664 } else {

665 } else {

665− rx.try_recv().ok()

666+ let msg = rx.try_recv();

667+

668+ if let Err(err) = msg {

669+ match err {

670+ TryRecvError::Empty => return None,

671+ TryRecvError::Disconnected => None,

672+ }

673+ } else {

674+ msg.ok()

675+ }

666 };

676 };

667

677

668 let save = match save_req {

678 let save = match save_req {