aboutsummaryrefslogtreecommitdiffstats
path: root/mail/e-mail-paned-view.c
diff options
context:
space:
mode:
Diffstat (limited to 'mail/e-mail-paned-view.c')
-rw-r--r--mail/e-mail-paned-view.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/mail/e-mail-paned-view.c b/mail/e-mail-paned-view.c
index 0a9a0c0f1a..4c4c6b62eb 100644
--- a/mail/e-mail-paned-view.c
+++ b/mail/e-mail-paned-view.c
@@ -515,6 +515,11 @@ mail_paned_view_set_folder (EMailReader *reader,
view = E_MAIL_VIEW (reader);
shell_view = e_mail_view_get_shell_view (view);
+
+ /* Can be NULL, if the shell window was closed meanwhile */
+ if (!shell_view)
+ return;
+
shell_window = e_shell_view_get_shell_window (shell_view);
shell = e_shell_window_get_shell (shell_window);