From 76d23e8354bce5fa82af61e3ecedd507ebbe52ba Mon Sep 17 00:00:00 2001
From: Johannes Wolf <mail@johannes-wolf.com>
Date: Fri, 19 Dec 2025 15:53:03 +0100
Subject: [PATCH] Fix NullPointerException for null TrayIcon

---
 .../src/main/java/mage/client/components/tray/MageTray.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Mage.Client/src/main/java/mage/client/components/tray/MageTray.java b/Mage.Client/src/main/java/mage/client/components/tray/MageTray.java
index 4bd3166cbe9..59ad366a3f5 100644
--- a/Mage.Client/src/main/java/mage/client/components/tray/MageTray.java
+++ b/Mage.Client/src/main/java/mage/client/components/tray/MageTray.java
@@ -79,13 +79,15 @@ public enum MageTray {
             } catch (AWTException e) {
                 log.error("TrayIcon could not be added: ", e);
             }
-
         } catch (Exception e) {
             log.error(e);
         }
     }
 
     public synchronized void blink() {
+        if (trayIcon == null)
+            return;
+
         if (state == 0) {
             synchronized (MageTray.class) {
                 if (state == 0) {