aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2011-01-12 20:57:36 +0800
committerRodrigo Moya <rodrigo@gnome-db.org>2011-06-30 00:41:18 +0800
commit74bc8ba6d1ccdd7813c7f7c40e1329ef47ef4fd4 (patch)
tree69808d5471ea189b874b30d842ba54b2970c5da0
parentcf5962928446a9c7ee6a5dfe363395b6d32c0c18 (diff)
downloadgsoc2013-evolution-74bc8ba6d1ccdd7813c7f7c40e1329ef47ef4fd4.tar.gz
gsoc2013-evolution-74bc8ba6d1ccdd7813c7f7c40e1329ef47ef4fd4.tar.zst
gsoc2013-evolution-74bc8ba6d1ccdd7813c7f7c40e1329ef47ef4fd4.zip
Bug #600013 - Crash in mail_reader_message_loaded_cb
-rw-r--r--mail/e-mail-reader.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index 3d3c4b3ffe..b9a3b8b584 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -2606,6 +2606,12 @@ mail_reader_message_loaded_cb (CamelFolder *folder,
formatter = e_mail_reader_get_formatter (reader);
message_list = e_mail_reader_get_message_list (reader);
+ if (!message_list) {
+ /* for cases where message fetching took so long that
+ user closed the message window before this was called */
+ goto exit;
+ }
+
shell_backend = E_SHELL_BACKEND (backend);
shell = e_shell_backend_get_shell (shell_backend);
shell_settings = e_shell_get_shell_settings (shell);