[geary/wip/765516-gtk-widget-conversation-viewer: 147/174] Fix possible crit loading an avatar for a cancelled conversation load.



commit 29459c6817cf5cfc7ed62da40564d4fb66da23d9
Author: Michael James Gratton <mike vee net>
Date:   Thu Sep 8 12:11:10 2016 +1000

    Fix possible crit loading an avatar for a cancelled conversation load.

 .../conversation-viewer/conversation-message.vala  |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/src/client/conversation-viewer/conversation-message.vala 
b/src/client/conversation-viewer/conversation-message.vala
index eb598ee..426ac73 100644
--- a/src/client/conversation-viewer/conversation-message.vala
+++ b/src/client/conversation-viewer/conversation-message.vala
@@ -367,7 +367,8 @@ public class ConversationMessage : Gtk.Grid {
                 )
             );
             session.queue_message(message, (session, message) => {
-                    if (message.status_code == 200) {
+                    if (message.status_code == 200 &&
+                        !load_cancellable.is_cancelled()) {
                         set_avatar(message.response_body.data);
                     }
                 });


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]