Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-19 23:06:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(imap): only interrupt existing idle connection

Browse Source
This commit is contained in:
dignifiedquire
2019-05-14 11:24:54 +02:00
parent 4f2bcb5f42
commit 5a1dd3ccbe
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/dc_imap.rs
View File

@@ -1027,15 +1027,19 @@ impl Imap {
} }
pub fn interrupt_idle(&self) { pub fn interrupt_idle(&self) {
if let Some(ref mut stream) = self.session.lock().unwrap().1 { // only kill the connection, if we are actually ideling
match stream.shutdown(net::Shutdown::Both) { if self.session.lock().unwrap().0.is_none() {
Ok(_) => {} if let Some(ref mut stream) = self.session.lock().unwrap().1 {
Err(err) => { match stream.shutdown(net::Shutdown::Both) {
eprintln!("failed to disconnect: {}", err); Ok(_) => {}
Err(err) => {
eprintln!("failed to disconnect: {}", err);
}
} }
} }
} }
// interrupt fake idle
let &(ref lock, ref cvar) = &*self.watch.clone(); let &(ref lock, ref cvar) = &*self.watch.clone();
let mut watch = lock.lock().unwrap(); let mut watch = lock.lock().unwrap();