From 0f078b47bc5bd67d2f2f720fa8d505e24de2b3be Mon Sep 17 00:00:00 2001 From: ghidravore Date: Wed, 22 Dec 2021 12:19:06 -0500 Subject: [PATCH] GP-1628 fixed stack trace when invoking contextMenu without using mouse --- .../Docking/src/main/java/docking/ActionContext.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Ghidra/Framework/Docking/src/main/java/docking/ActionContext.java b/Ghidra/Framework/Docking/src/main/java/docking/ActionContext.java index bef6edff42..b55469f346 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/ActionContext.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/ActionContext.java @@ -228,8 +228,10 @@ public class ActionContext { * @return this context */ public ActionContext setMouseEvent(MouseEvent e) { - this.mouseEvent = e; - this.eventClickModifiers = e.getModifiersEx(); + if (e != null) { + this.mouseEvent = e; + this.eventClickModifiers = e.getModifiersEx(); + } return this; }