[geary/mjog/741-inbox-getting-closed: 2/3] Geary.App.ConversationMonitor: Throw error closing folder when possible

[Michael Gratton <mjog src gnome org>]

commit 22357ed71b8de12508e935cb5ee6b0f7df594ecb
Author: Michael Gratton <mike vee net>
Date:   Fri Apr 10 14:41:00 2020 +1000

    Geary.App.ConversationMonitor: Throw error closing folder when possible

 src/engine/app/app-conversation-monitor.vala | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/src/engine/app/app-conversation-monitor.vala b/src/engine/app/app-conversation-monitor.vala
index 91f1238a..1edf3313 100644
--- a/src/engine/app/app-conversation-monitor.vala
+++ b/src/engine/app/app-conversation-monitor.vala
@@ -675,11 +675,16 @@ public class Geary.App.ConversationMonitor : BaseObject {
         bool closing = false;
         if (folder_was_opened) {
             try {
-                // Always close the folder to prevent open leaks
                 closing = yield this.base_folder.close_async(null);
-            } catch (Error err) {
-                warning("Unable to close monitored folder %s: %s",
-                        this.base_folder.to_string(), err.message);
+            } catch (GLib.Error err) {
+                if (close_err == null) {
+                    close_err = err;
+                } else {
+                    warning(
+                        "Unable to close monitored folder %s: %s",
+                        this.base_folder.to_string(), err.message
+                    );
+                }
             }
         }