Commit df910105 authored by Michael Gratton's avatar Michael Gratton 🤞 Committed by Michael Gratton

Fix a shutdown hang

parent 4b2d13f8
Pipeline #72344 passed with stages
in 58 minutes and 12 seconds
......@@ -181,16 +181,18 @@ private abstract class Geary.ImapEngine.GenericAccount : Geary.Account {
);
}
// Block obtaining and reusing IMAP connections
this.remote_ready_lock.reset();
this.imap.discard_returned_sessions = true;
// Halt internal tasks early so they stop using local and
// remote connections.
this.refresh_folder_timer.reset();
this.open_cancellable.cancel();
this.processor.stop();
// Block obtaining and reusing IMAP connections. This *must*
// happen after internal tasks above are cancelled otherwise
// they may block while waiting/using a remote session.
this.imap.discard_returned_sessions = true;
this.remote_ready_lock.reset();
// Close folders and ensure they do in fact close
Gee.BidirSortedSet<Folder> locals = sort_by_path(this.local_only.values);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment