commit 2d240605f5653a84bb14e03e4ba6e5307e1e9869
author Lakshmi Shanmugam <lshanmug@in.ibm.com> Tue Jun 16 15:09:05 2020 +0530
committer Lakshmi Shanmugam <lshanmug@in.ibm.com> Wed Jun 17 01:03:34 2020 -0400
tree 4d358cb428687a5cd72a5992678acb1f26050d2b
parent 98a047ed19e2f8f6ee25c7563c913c6258fa6324

Bug 563796 - NPE in DropTarget.getOperationFromKeyState

Added null check for NSApplication.currentEvent().

Change-Id: Ic1715e6931c7a675a425d6a38f89f6bba4ae68f5
Signed-off-by: Lakshmi Shanmugam <lshanmug@in.ibm.com>

bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/DropTarget.java

diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/DropTarget.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/DropTarget.java
index 979e1e4..988f18d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/DropTarget.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/DropTarget.java
@@ -546,12 +546,14 @@
 	// correct Cocoa behavior.  Control + Option or Command is NSDragOperationGeneric,
 	// or DND.DROP_DEFAULT in the SWT.
 	NSEvent currEvent = NSApplication.sharedApplication().currentEvent();
-	long modifiers = currEvent.modifierFlags();
-	boolean option = (modifiers & OS.NSAlternateKeyMask) == OS.NSAlternateKeyMask;
-	boolean control = (modifiers & OS.NSControlKeyMask) == OS.NSControlKeyMask;
-	if (control && option) return DND.DROP_DEFAULT;
-	if (control) return DND.DROP_LINK;
-	if (option) return DND.DROP_COPY;
+	if (currEvent != null) {
+		long modifiers = currEvent.modifierFlags();
+		boolean option = (modifiers & OS.NSAlternateKeyMask) == OS.NSAlternateKeyMask;
+		boolean control = (modifiers & OS.NSControlKeyMask) == OS.NSControlKeyMask;
+		if (control && option) return DND.DROP_DEFAULT;
+		if (control) return DND.DROP_LINK;
+		if (option) return DND.DROP_COPY;
+	}
 	return DND.DROP_DEFAULT;
 }