From 8888ad02c22f90f5888e74bde19cc67553b0b395 Mon Sep 17 00:00:00 2001 From: Jefferson Stachelski Date: Wed, 18 Nov 2015 15:04:19 -0200 Subject: Issue #511 - Don't deleting if mail is None --- service/pixelated/adapter/services/mail_service.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'service/pixelated/adapter/services/mail_service.py') diff --git a/service/pixelated/adapter/services/mail_service.py b/service/pixelated/adapter/services/mail_service.py index bbaad2c5..7e6f1c63 100644 --- a/service/pixelated/adapter/services/mail_service.py +++ b/service/pixelated/adapter/services/mail_service.py @@ -123,10 +123,11 @@ class MailService(object): @defer.inlineCallbacks def delete_mail(self, mail_id): mail = yield self.mail(mail_id) - if mail.mailbox_name.upper() == u'TRASH': - yield self.mail_store.delete_mail(mail_id) - else: - yield self.mail_store.move_mail_to_mailbox(mail_id, 'TRASH') + if mail is not None: + if mail.mailbox_name.upper() == u'TRASH': + yield self.mail_store.delete_mail(mail_id) + else: + yield self.mail_store.move_mail_to_mailbox(mail_id, 'TRASH') @defer.inlineCallbacks def recover_mail(self, mail_id): -- cgit v1.2.3