[geary/mjog/invert-folder-class-hierarchy: 72/72] engine: Fix null critical on folder shutdown




commit e88e6596959a32badaa8f7d8825cf27abbbc8744
Author: Michael Gratton <mike vee net>
Date:   Wed Mar 3 21:02:31 2021 +1100

    engine: Fix null critical on folder shutdown
    
    Don't actually execute close ops in `ReplayQueue` since the remote
    will be null, but the method requires a non-null value.

 src/engine/imap-engine/imap-engine-replay-queue.vala | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
---
diff --git a/src/engine/imap-engine/imap-engine-replay-queue.vala 
b/src/engine/imap-engine/imap-engine-replay-queue.vala
index 5cea1f716..0fc88f6a8 100644
--- a/src/engine/imap-engine/imap-engine-replay-queue.vala
+++ b/src/engine/imap-engine/imap-engine-replay-queue.vala
@@ -626,7 +626,9 @@ private class Geary.ImapEngine.ReplayQueue : BaseObject, Logging.Source {
             remotely_executing(op);
 
             GLib.Error? remote_err = null;
-            if (remote != null || is_close_op) {
+            // Don't actually execute a close op, since there's no
+            // remote to pass to it.
+            if (remote != null && !is_close_op) {
                 if (op.remote_retry_count > 0)
                     debug("Retrying op %s on %s", op.to_string(), to_string());
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]