nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ensure EmailStore always closes folders when executing an operation.

Browse source
This commit is contained in:
Michael James Gratton 2017-11-28 17:40:15 +11:00
parent 12adbbdcb1
commit f8dc87cb36
1 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/engine/app/app-email-store.vala
View file

@ -181,30 +181,31 @@ public class Geary.App.EmailStore : BaseObject {
try {
debug("EmailStore opening %s for %s on %d emails", folder.to_string(),
operation.get_type().name(), ids.size);
yield folder.open_async(Geary.Folder.OpenFlags.FAST_OPEN, cancellable);
open = true;
used_ids = yield operation.execute_async(folder, ids, cancellable);
yield folder.close_async(cancellable);
open = false;
debug("EmailStore closed %s after %s on %d emails", folder.to_string(),
operation.get_type().name(), ids.size);
} catch (Error e) {
debug("Error performing an operation on messages in %s: %s", folder.to_string(), e.message);
} finally {
if (open) {
try {
yield folder.close_async(cancellable);
open = false;
// Don't use the cancellable here, if it's been
// opened we need to try to close it.
yield folder.close_async(null);
debug(
"EmailStore closed %s after %s on %d emails",
folder.to_string(),
operation.get_type().name(),
ids.size
);
} catch (Error e) {
debug("Error closing folder %s: %s", folder.to_string(), e.message);
debug("Error closing folder %s: %s",
folder.to_string(), e.message);
}
}
}
// We don't want to operate on any mails twice.
if (used_ids != null) {
foreach (Geary.EmailIdentifier id in used_ids.to_array()) {