From ba7e4cc65bb13058b8bce2a52e09c5ce5b22eea5 Mon Sep 17 00:00:00 2001 From: mguessan Date: Mon, 17 Mar 2014 23:01:40 +0000 Subject: [PATCH] From coverity: trayItem.getImage may return null git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@2259 3d1905a2-6b24-0410-a738-b14d5a86fcbd --- src/java/davmail/ui/tray/SwtGatewayTray.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/java/davmail/ui/tray/SwtGatewayTray.java b/src/java/davmail/ui/tray/SwtGatewayTray.java index 15765506..2956a4d5 100644 --- a/src/java/davmail/ui/tray/SwtGatewayTray.java +++ b/src/java/davmail/ui/tray/SwtGatewayTray.java @@ -78,7 +78,8 @@ public class SwtGatewayTray implements DavGatewayTrayInterface { isActive = true; display.syncExec(new Runnable() { public void run() { - if (trayItem.getImage().equals(image)) { + Image currentImage = trayItem.getImage(); + if (currentImage != null && currentImage.equals(image)) { trayItem.setImage(image2); } else { trayItem.setImage(image);