[geary] Fix bug in reestablishment logic intro'd in commit 86f1854

[Jim Nelson <jnelson src gnome org>]

commit ab7ede3ec66c2acd42e475924112040df588e681
Author: Jim Nelson <jim yorba org>
Date:   Fri Jan 31 10:43:29 2014 -0800

    Fix bug in reestablishment logic intro'd in commit 86f1854
    
    One bug in that commit was that only one of two the two conditionals
    for entering connection reestablishment was considered when
    determining if the Folder should close.  This change now uses both
    conditionals.  Without this, it's possible for the remote to fail
    to open due to connection error and the Folder to remain open although
    reestablishment doesn't occur because there's no remote folder to
    establish with.

 .../imap-engine/imap-engine-generic-folder.vala    |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/src/engine/imap-engine/imap-engine-generic-folder.vala 
b/src/engine/imap-engine/imap-engine-generic-folder.vala
index 9af8b1d..92b8ef9 100644
--- a/src/engine/imap-engine/imap-engine-generic-folder.vala
+++ b/src/engine/imap-engine/imap-engine-generic-folder.vala
@@ -661,7 +661,7 @@ private class Geary.ImapEngine.GenericFolder : Geary.AbstractFolder, Geary.Folde
         
         // if remote reason is an error, then close_remote_folder_async() will be performing
         // reestablishment, so go no further
-        if (remote_reason.is_error())
+        if (remote_reason.is_error() && closing_remote_folder != null)
             return;
         
         // forced closed one way or another