Author: echatellier Date: 2009-09-24 10:59:09 +0200 (Thu, 24 Sep 2009) New Revision: 2667 Modified: trunk/src/main/java/org/chorem/jtimer/ui/systray/SystrayManager.java Log: Fix NPE Modified: trunk/src/main/java/org/chorem/jtimer/ui/systray/SystrayManager.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/systray/SystrayManager.java 2009-09-16 07:44:32 UTC (rev 2666) +++ trunk/src/main/java/org/chorem/jtimer/ui/systray/SystrayManager.java 2009-09-24 08:59:09 UTC (rev 2667) @@ -304,21 +304,22 @@ } // display message - String message = null; - if (nbTasksRunning == 0) { - message = resourceMap.getString("tooltipIdleText"); - - trayIcon.setImage(idleImage); - } else { - trayIcon.setImage(runningImage); - if (nbTasksRunning == 1) { - message = resourceMap.getString("tooltipRunningTaskText", nbTasksRunning); + if (trayIcon != null) { + String message = null; + if (nbTasksRunning == 0) { + message = resourceMap.getString("tooltipIdleText"); + + trayIcon.setImage(idleImage); } else { - message = resourceMap.getString("tooltipRunningTasksText", nbTasksRunning); + trayIcon.setImage(runningImage); + if (nbTasksRunning == 1) { + message = resourceMap.getString("tooltipRunningTaskText", nbTasksRunning); + } else { + message = resourceMap.getString("tooltipRunningTasksText", nbTasksRunning); + } } + trayIcon.setToolTip(message); } - trayIcon.setToolTip(message); - } /**