X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-mail-operation.c;h=c7399b5ffedfae4759218b3cce47e2cbeed93e3f;hp=c9986db290a95519a876d1e550a7efe38cc97373;hb=04691c42117fd68177b047f77e321321aa5e1260;hpb=46283d0da3ca90d9516fb33c7299dd12ee86cacb

diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c
index c9986db..c7399b5 100644
--- a/src/modest-mail-operation.c
+++ b/src/modest-mail-operation.c
@@ -665,7 +665,7 @@ send_mail_on_sync_async_cb (TnyFolder *folder,
 	self = helper->mail_op;
 	priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
 
-	if (cancelled || err)
+	if (cancelled)
 		goto end;
 
 	if (err) {
@@ -750,7 +750,7 @@ send_mail_on_added_to_outbox (TnySendQueue *send_queue,
 	self = helper->mail_op;
 	priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
 
-	if (cancelled || err)
+	if (cancelled)
 		goto end;
 
 	if (err) {
@@ -2097,7 +2097,7 @@ modest_mail_operation_create_folder (ModestMailOperation *self,
 		}
 	}
 
-	if (!strcmp (name, " ") || strchr (name, '/')) {
+	if (!priv->error && (!strcmp (name, " ") || strchr (name, '/'))) {
 		priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
 		g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
 			     MODEST_MAIL_OPERATION_ERROR_FOLDER_RULES,