This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 9f742ff56dae537ab7c0c8d629ce5da0fa85521e Author: jcouteau <couteau@codelutin.com> Date: Thu Aug 22 09:07:51 2019 +0200 fix NPE --- .../ui/swing/content/attachment/AttachmentEditorUIHandler.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java index 2c3e0b6e..7d6e379a 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java @@ -230,8 +230,12 @@ public class AttachmentEditorUIHandler extends AbstractToolbarPopupHandler<Attac } public boolean isAttachmentEditable(Attachment attachment) { - return FaxToMailUIUtil.isFileTypeEditable(attachment.getOriginalFileName()) - && (getModel().isEditable() || attachment.getEditedFileName() != null); + if (attachment != null) { + return FaxToMailUIUtil.isFileTypeEditable(attachment.getOriginalFileName()) + && (getModel().isEditable() || attachment.getEditedFileName() != null); + } else { + return false; + } } public boolean isAttachmentRemovable(Attachment attachment) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.