From 4cda728c0947ac35e52d4726e8eefc115c7b30be Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 24 Jun 2014 11:44:06 +0200 Subject: Bug 719379 - Send/Receive dialog doesn't close on errors properly --- mail/mail-send-recv.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c index d6b0edd4c9..0bd074b759 100644 --- a/mail/mail-send-recv.c +++ b/mail/mail-send-recv.c @@ -1242,15 +1242,19 @@ receive_update_got_folderinfo (GObject *source_object, /* Ignore cancellations. */ if (g_error_matches (local_error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) { - g_warn_if_fail (info != NULL); + g_warn_if_fail (info == NULL); g_error_free (local_error); + receive_done (send_info); + /* XXX Need to hand this off to an EAlertSink. */ } else if (local_error != NULL) { - g_warn_if_fail (info != NULL); + g_warn_if_fail (info == NULL); g_warning ("%s: %s", G_STRFUNC, local_error->message); g_error_free (local_error); + receive_done (send_info); + /* CamelFolderInfo may be NULL even if no error occurred. */ } else if (info != NULL) { GPtrArray *folders = g_ptr_array_new (); -- cgit v1.2.3