aboutsummaryrefslogtreecommitdiffstats
path: root/mail/e-mail-shell-content.c
diff options
context:
space:
mode:
Diffstat (limited to 'mail/e-mail-shell-content.c')
-rw-r--r--mail/e-mail-shell-content.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/mail/e-mail-shell-content.c b/mail/e-mail-shell-content.c
index 6d1ffc0a08..cdd49aa718 100644
--- a/mail/e-mail-shell-content.c
+++ b/mail/e-mail-shell-content.c
@@ -450,7 +450,12 @@ e_mail_shell_content_update_view_instance (EMailShellContent *mail_shell_content
view_collection = shell_view_class->view_collection;
folder_view = e_mail_shell_content_get_folder_view (mail_shell_content);
- g_return_if_fail (folder_view->folder != NULL);
+
+ /* If no folder is selected, return silently. */
+ if (folder_view->folder == NULL)
+ return;
+
+ /* If we have a folder, we should also have a URI. */
g_return_if_fail (folder_view->folder_uri != NULL);
if (mail_shell_content->priv->view_instance != NULL) {