diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorDropAdapterAssistant.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorDropAdapterAssistant.java index b764e87e6e6..77325bf805f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorDropAdapterAssistant.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorDropAdapterAssistant.java @@ -210,6 +210,9 @@ public class CNavigatorDropAdapterAssistant extends CommonDropAdapterAssistant { ISelection selection = LocalSelectionTransfer.getTransfer().getSelection(); ICElement[] cElements= getCElements(selection); + if (cElements == null || cElements.length == 0) { + return Status.CANCEL_STATUS; + } if (!canCopyElements(cElements)) return Status.CANCEL_STATUS; @@ -226,7 +229,10 @@ public class CNavigatorDropAdapterAssistant extends CommonDropAdapterAssistant { ISelection selection = LocalSelectionTransfer.getTransfer().getSelection(); ICElement[] cElements= getCElements(selection); - + + if (cElements == null || cElements.length == 0) { + return Status.CANCEL_STATUS; + } if (Arrays.asList(cElements).contains(target)) { return Status.CANCEL_STATUS; }