[geary/wip/765516-gtk-widget-conversation-viewer: 141/174] Fix a possible critical error.



commit af1edf93ccdf65b6168c2face7a33fb0ff86273c
Author: Michael James Gratton <mike vee net>
Date:   Wed Sep 7 10:37:18 2016 +1000

    Fix a possible critical error.

 src/engine/app/app-conversation.vala |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/src/engine/app/app-conversation.vala b/src/engine/app/app-conversation.vala
index bb96a54..cb9b2c8 100644
--- a/src/engine/app/app-conversation.vala
+++ b/src/engine/app/app-conversation.vala
@@ -186,13 +186,15 @@ public class Geary.App.Conversation : BaseObject {
         
         return email;
     }
-    
+
     public bool is_in_current_folder(Geary.EmailIdentifier id) {
         Gee.Collection<Geary.FolderPath>? paths = path_map.get(id);
-        
-        return (paths != null && paths.contains(owner.folder.path));
+
+        return (paths != null &&
+                owner != null &&
+                paths.contains(owner.folder.path));
     }
-    
+
     /**
      * Return all Message IDs associated with the conversation.
      */


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