Update InputState.java

Fix Issue #197 #197
assertj · Sep 8, 2020 · 6634e26 · 6634e26
1 parent 5009498
commit 6634e26
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/assertj-swing/src/main/java/org/assertj/swing/input/InputState.java b/assertj-swing/src/main/java/org/assertj/swing/input/InputState.java
@@ -109,13 +109,16 @@ public void update(@Nonnull AWTEvent event) {
       }
       if (inputEvent instanceof MouseEvent) {
         MouseEvent mouseEvent = (MouseEvent) inputEvent;
-        Point eventScreenLocation = screenLocation(mouseEvent);
-        synchronized (this) {
-          lastEventTime(mouseEvent);
-          dragDropInfo.update(mouseEvent);
-          mouseInfo.modifiers(modifiers);
-          mouseInfo.update(mouseEvent, eventScreenLocation);
-          modifiers(mouseInfo.modifiers());
+        //TrayIcon might post events without a component
+        if(mouseEvent.getComponent() != null) {
+          Point eventScreenLocation = screenLocation(mouseEvent);
+          synchronized (this) {
+            lastEventTime(mouseEvent);
+            dragDropInfo.update(mouseEvent);
+            mouseInfo.modifiers(modifiers);
+            mouseInfo.update(mouseEvent, eventScreenLocation);
+            modifiers(mouseInfo.modifiers());
+          }
         }
       }
     }