From 248efafa1d93fc1e0cd004135bd8cd63737a7b07 Mon Sep 17 00:00:00 2001
From: mguessan <mguessan@3d1905a2-6b24-0410-a738-b14d5a86fcbd>
Date: Wed, 19 Mar 2014 22:23:38 +0000
Subject: [PATCH] From coverity: check null image in FrameGatewayTray

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@2276 3d1905a2-6b24-0410-a738-b14d5a86fcbd
---
 src/java/davmail/ui/tray/FrameGatewayTray.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/java/davmail/ui/tray/FrameGatewayTray.java b/src/java/davmail/ui/tray/FrameGatewayTray.java
index 883d7bb4..af6c4984 100644
--- a/src/java/davmail/ui/tray/FrameGatewayTray.java
+++ b/src/java/davmail/ui/tray/FrameGatewayTray.java
@@ -69,7 +69,8 @@ public class FrameGatewayTray implements DavGatewayTrayInterface {
         isActive = true;
         SwingUtilities.invokeLater(new Runnable() {
             public void run() {
-                if (mainFrame.getIconImage().equals(image)) {
+                Image currentImage = mainFrame.getIconImage();
+                if (currentImage != null && currentImage.equals(image)) {
                     mainFrame.setIconImage(image2);
                 } else {
                     mainFrame.setIconImage(image);