Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Schindl2016-01-20 20:43:59 +0000
committerTom Schindl2016-01-20 20:43:59 +0000
commitfebe6822c82bb735a31c3a2fcb155f823fb3a233 (patch)
tree19b7dbe4a9228b7393529d32dd54750f2dd2fd64
parent959868df21f87c3f31659380b566357aeb1c774b (diff)
downloadorg.eclipse.efxclipse-febe6822c82bb735a31c3a2fcb155f823fb3a233.tar.gz
org.eclipse.efxclipse-febe6822c82bb735a31c3a2fcb155f823fb3a233.tar.xz
org.eclipse.efxclipse-febe6822c82bb735a31c3a2fcb155f823fb3a233.zip
Bug 486200 - NPE in DndAddon
-rw-r--r--bundles/runtime/org.eclipse.fx.ui.workbench.renderers.base/src/org/eclipse/fx/ui/workbench/renderers/base/addons/DnDAddon.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/bundles/runtime/org.eclipse.fx.ui.workbench.renderers.base/src/org/eclipse/fx/ui/workbench/renderers/base/addons/DnDAddon.java b/bundles/runtime/org.eclipse.fx.ui.workbench.renderers.base/src/org/eclipse/fx/ui/workbench/renderers/base/addons/DnDAddon.java
index 692e371c0..76760c8cb 100644
--- a/bundles/runtime/org.eclipse.fx.ui.workbench.renderers.base/src/org/eclipse/fx/ui/workbench/renderers/base/addons/DnDAddon.java
+++ b/bundles/runtime/org.eclipse.fx.ui.workbench.renderers.base/src/org/eclipse/fx/ui/workbench/renderers/base/addons/DnDAddon.java
@@ -259,7 +259,7 @@ public class DnDAddon {
@SuppressWarnings("null")
@NonNull
private Boolean dragStartHandler(@NonNull DragData d) {
- return Boolean.valueOf(this.dndService.dragAllowed(d.container, d.item));
+ return Boolean.valueOf(dndService == null || this.dndService.dragAllowed(d.container, d.item));
}
@PostConstruct

Back to the top