From 02a23c474734ca2a234fc1467d2714f673e911aa Mon Sep 17 00:00:00 2001 From: Charles Lindsay Date: Tue, 9 Jul 2013 11:05:55 -0700 Subject: [PATCH] Don't assert when switching folders; fix #7141 --- src/engine/imap-engine/imap-engine-generic-folder.vala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/engine/imap-engine/imap-engine-generic-folder.vala b/src/engine/imap-engine/imap-engine-generic-folder.vala index a06a36b0..5c1e3828 100644 --- a/src/engine/imap-engine/imap-engine-generic-folder.vala +++ b/src/engine/imap-engine/imap-engine-generic-folder.vala @@ -591,7 +591,8 @@ private class Geary.ImapEngine.GenericFolder : Geary.AbstractFolder, Geary.Folde if (open_count == 0 || --open_count > 0) return; - _properties.remove(remote_folder.properties); + if (remote_folder != null) + _properties.remove(remote_folder.properties); yield close_internal_async(CloseReason.LOCAL_CLOSE, CloseReason.REMOTE_CLOSE, cancellable); }