Merge "Removed 3D modelling preferences page description which is equals title"

[simantics/3d.git] / org.simantics.plant3d / src / org / simantics / plant3d / dialog / ComponentSelectionDialog.java

diff --git a/org.simantics.plant3d/src/org/simantics/plant3d/dialog/ComponentSelectionDialog.java b/org.simantics.plant3d/src/org/simantics/plant3d/dialog/ComponentSelectionDialog.java
index cfd8c861dbc7d578f9f7e7ee39eaad13a9014e63..2321c1f9941fbd89f2251c6b64b9f89a2ec8efea 100644 (file)
--- a/org.simantics.plant3d/src/org/simantics/plant3d/dialog/ComponentSelectionDialog.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/dialog/ComponentSelectionDialog.java
@@ -447,8 +447,10 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange
                GridDataFactory.fillDefaults().span(2, 1).align(SWT.END, SWT.END).grab(true, false).applyTo(validationLabel);
 
                if (!allowed.contains(PositionType.NEXT) && !allowed.contains(PositionType.PREVIOUS)) {
-                       turnViewer.getList().setEnabled(false);
-                       endViewer.getList().setEnabled(false);
+                       if (turnViewer != null)
+                               turnViewer.getList().setEnabled(false);
+                       if (endViewer != null)
+                               endViewer.getList().setEnabled(false);
                        inlineSplit = true;
                }