[geary/wip/cx-reestablish: 5/5] Close folder if normalize_folder() fails due to logic error

[Jim Nelson <jnelson src gnome org>]

commit f10b1313058356fe022ed8b67d237c17ea20f52f
Author: Jim Nelson <jim yorba org>
Date:   Tue Jan 20 14:20:25 2015 -0800

    Close folder if normalize_folder() fails due to logic error

 .../imap-engine/imap-engine-minimal-folder.vala    |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/src/engine/imap-engine/imap-engine-minimal-folder.vala 
b/src/engine/imap-engine/imap-engine-minimal-folder.vala
index d78d737..5dc21f1 100644
--- a/src/engine/imap-engine/imap-engine-minimal-folder.vala
+++ b/src/engine/imap-engine/imap-engine-minimal-folder.vala
@@ -649,6 +649,10 @@ private class Geary.ImapEngine.MinimalFolder : Geary.Folder, Geary.FolderSupport
                 // stop before starting the close
                 opening_monitor.notify_finish();
                 
+                // normalize_folders() returning false indicates a soft error, but hard in the sense
+                // that opening cannot proceed, even with a connection retry
+                open_count = 0;
+                
                 // schedule immediate close
                 close_internal_async.begin(CloseReason.LOCAL_CLOSE, CloseReason.REMOTE_CLOSE, false,
                     cancellable);