branch develop-1.1.x updated (4f1cf53 -> ac6be71)
This is an automated email from the git hooks/post-receive script. New change to branch develop-1.1.x in repository faxtomail. See http://git.codelutin.com/faxtomail.git from 4f1cf53 Merge branch 'feature/8053' into develop-1.1.x new ac6be71 quand on quitte sans sauer, on met le modèle à non modifié (fixes #8069) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit ac6be71bd68f4caa724c071411220ba2f7dc2713 Author: Kevin Morin <morin@codelutin.com> Date: Fri Mar 4 08:02:27 2016 +0100 quand on quitte sans sauer, on met le modèle à non modifié (fixes #8069) Summary of changes: .../faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java | 4 ++++ 1 file changed, 4 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop-1.1.x in repository faxtomail. See http://git.codelutin.com/faxtomail.git commit ac6be71bd68f4caa724c071411220ba2f7dc2713 Author: Kevin Morin <morin@codelutin.com> Date: Fri Mar 4 08:02:27 2016 +0100 quand on quitte sans sauer, on met le modèle à non modifié (fixes #8069) --- .../faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java index 55710af..a1b690f 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java @@ -237,6 +237,10 @@ public class PDFEditorUIHandler extends AbstractFaxToMailUIHandler<PDFEditorUIMo t("faxtomail.pdfEditor.askSaveBeforeLeaving.save"), getContext().getActionFactory().createLogicAction(this, GenerateAnnotatedAttachmentAction.class) ); + // soit les modifs doivent etre annulées, soit elles ont été enregistrées, donc on peut reseter le model + if (result) { + getModel().setModify(false); + } return result; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm