aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2011-01-12 20:57:36 +0800
committerMilan Crha <mcrha@redhat.com>2011-01-12 20:57:36 +0800
commit88e2ead0df3a7b62c59a8ffb2d50cf1cf1b884bb (patch)
tree6d20d361a94547ee628abc7c39717f8fd7d7f097
parent9db891790a1a7ab13f6b41ffd2232a87c949a93d (diff)
downloadgsoc2013-evolution-88e2ead0df3a7b62c59a8ffb2d50cf1cf1b884bb.tar.gz
gsoc2013-evolution-88e2ead0df3a7b62c59a8ffb2d50cf1cf1b884bb.tar.zst
gsoc2013-evolution-88e2ead0df3a7b62c59a8ffb2d50cf1cf1b884bb.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);