[geary/wip/search-cleanup: 1/9] Fix critical when email body load is cancelled

[Michael Gratton <mjog src gnome org>]

commit c54cb05793429085681fa2627e0b54f3ebe7d170
Author: Michael Gratton <mike vee net>
Date:   Sun Feb 3 16:27:05 2019 +1100

    Fix critical when email body load is cancelled
    
    This was happening when a search query was changing rapidly as it was
    being typed, hence conversations being quickly loaded and cancelled.

 src/client/conversation-viewer/conversation-email.vala | 3 +++
 1 file changed, 3 insertions(+)
---
diff --git a/src/client/conversation-viewer/conversation-email.vala 
b/src/client/conversation-viewer/conversation-email.vala
index 44f6724b..2076983f 100644
--- a/src/client/conversation-viewer/conversation-email.vala
+++ b/src/client/conversation-viewer/conversation-email.vala
@@ -611,6 +611,9 @@ public class ConversationEmail : Gtk.Box, Geary.BaseInterface {
                 // load timeout here since this will attempt to fetch
                 // from the remote
                 this.fetch_remote_body.begin();
+            } catch (GLib.IOError.CANCELLED err) {
+                this.body_loading_timeout.reset();
+                throw err;
             } catch (GLib.Error err) {
                 this.body_loading_timeout.reset();
                 handle_load_failure(err);