From 8bb5077e761a506100e75e95e80c3589894e35e8 Mon Sep 17 00:00:00 2001 From: CalDescent Date: Sun, 8 Aug 2021 08:29:29 +0100 Subject: [PATCH] Catch occasional NPE when setting tray icon. --- src/main/java/org/qortal/gui/SysTray.java | 30 +++++++++++++---------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/src/main/java/org/qortal/gui/SysTray.java b/src/main/java/org/qortal/gui/SysTray.java index 6fc994bf..8aee45fd 100644 --- a/src/main/java/org/qortal/gui/SysTray.java +++ b/src/main/java/org/qortal/gui/SysTray.java @@ -291,19 +291,23 @@ public class SysTray { public void setTrayIcon(int iconid) { if (trayIcon != null) { - switch (iconid) { - case 1: - this.trayIcon.setImage(Gui.loadImage("icons/qortal_ui_tray_syncing_time-alt.png")); - break; - case 2: - this.trayIcon.setImage(Gui.loadImage("icons/qortal_ui_tray_minting.png")); - break; - case 3: - this.trayIcon.setImage(Gui.loadImage("icons/qortal_ui_tray_syncing.png")); - break; - case 4: - this.trayIcon.setImage(Gui.loadImage("icons/qortal_ui_tray_synced.png")); - break; + try { + switch (iconid) { + case 1: + this.trayIcon.setImage(Gui.loadImage("icons/qortal_ui_tray_syncing_time-alt.png")); + break; + case 2: + this.trayIcon.setImage(Gui.loadImage("icons/qortal_ui_tray_minting.png")); + break; + case 3: + this.trayIcon.setImage(Gui.loadImage("icons/qortal_ui_tray_syncing.png")); + break; + case 4: + this.trayIcon.setImage(Gui.loadImage("icons/qortal_ui_tray_synced.png")); + break; + } + } catch (NullPointerException e) { + LOGGER.info("Unable to set tray icon"); } } }