[geary/wip/765516-gtk-widget-conversation-viewer: 186/187] Fix next another conversation load cancelled crit error.

[Michael Gratton <mjog src gnome org>]

commit 8d195fbd3c75195c43a634dc9996345ae983f949
Author: Michael James Gratton <mike vee net>
Date:   Mon Sep 19 16:39:30 2016 +1000

    Fix next another conversation load cancelled crit error.

 .../conversation-viewer/conversation-message.vala  |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/src/client/conversation-viewer/conversation-message.vala 
b/src/client/conversation-viewer/conversation-message.vala
index 59e6a1a..b32558b 100644
--- a/src/client/conversation-viewer/conversation-message.vala
+++ b/src/client/conversation-viewer/conversation-message.vala
@@ -761,7 +761,7 @@ public class ConversationMessage : Gtk.Grid {
             debug("Error loading Gravatar response: %s", err.message);
         }
 
-        if (avatar_buf != null) {
+        if (avatar_buf != null && !load_cancelled.is_cancelled()) {
             int window_scale = get_scale_factor();
             int avatar_size = this.avatar.pixel_size * window_scale;
             if (avatar_buf.width != avatar_size) {