aboutsummaryrefslogtreecommitdiffstats
path: root/em-format/e-mail-formatter.c
diff options
context:
space:
mode:
Diffstat (limited to 'em-format/e-mail-formatter.c')
-rw-r--r--em-format/e-mail-formatter.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/em-format/e-mail-formatter.c b/em-format/e-mail-formatter.c
index 7d0f589b8a..9ac8cf7678 100644
--- a/em-format/e-mail-formatter.c
+++ b/em-format/e-mail-formatter.c
@@ -169,6 +169,9 @@ mail_formatter_run (EMailFormatter *formatter,
iter = iter->next;
} while (iter);
+
+ if (!iter)
+ break;
}
}
}
@@ -845,8 +848,9 @@ e_mail_formatter_format (EMailFormatter *formatter,
g_simple_async_result_set_check_cancellable (simple, cancellable);
- if (!parts && callback) {
- callback (G_OBJECT (formatter), G_ASYNC_RESULT (simple), user_data);
+ if (!parts) {
+ if (callback)
+ callback (G_OBJECT (formatter), G_ASYNC_RESULT (simple), user_data);
g_object_unref (simple);
return;
}