This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See http://git.codelutin.com/faxtomail.git commit 72ad43bca976665e281230cd3c82dfb97836bbe0 Author: Kevin Morin <morin@codelutin.com> Date: Mon Aug 31 09:55:37 2015 +0200 fix NPE --- .../faxtomail/ui/swing/util/AbstractToolbarPopupButton.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractToolbarPopupButton.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractToolbarPopupButton.java index 09e16c4..3dab88f 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractToolbarPopupButton.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractToolbarPopupButton.java @@ -94,12 +94,16 @@ public abstract class AbstractToolbarPopupButton<UI extends AbstractToolbarPopup @Override public void windowLostFocus(WindowEvent e) { - if (popup.isVisible() && !popup.equals(e.getOppositeWindow())) { + Window oppositeWindow = e.getOppositeWindow(); + if (popup.isVisible() && !popup.equals(oppositeWindow)) { if (log.isDebugEnabled()) { log.debug("windowLostFocus : popup not always on top, bring to front opposite window"); } popup.setAlwaysOnTop(false); - e.getOppositeWindow().toFront(); + + if (oppositeWindow != null) { + oppositeWindow.toFront(); + } } } }; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.