X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=org.simantics.plant3d%2Fsrc%2Forg%2Fsimantics%2Fplant3d%2Fscenegraph%2Fcontrolpoint%2FPipeControlPoint.java;h=660558652c47c03c1897b7aa1a53761e6795a206;hb=refs%2Fchanges%2F31%2F3131%2F1;hp=2d8c00b22f5c20f7e09da25b99da30db78b1662d;hpb=24ef19cca93feb0306bca916c0506280c79bada0;p=simantics%2F3d.git

diff --git a/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/controlpoint/PipeControlPoint.java b/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/controlpoint/PipeControlPoint.java
index 2d8c00b2..66055865 100644
--- a/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/controlpoint/PipeControlPoint.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/controlpoint/PipeControlPoint.java
@@ -289,7 +289,7 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
     }
 	
 	public void setTurnAngle(Double turnAngle) {
-		if (Double.isInfinite(turnAngle) || Double.isNaN(turnAngle)) {
+		if (turnAngle == null || Double.isInfinite(turnAngle) || Double.isNaN(turnAngle)) {
 			return;
 		}
 		if (this.turnAngle != null && Math.abs(this.turnAngle-turnAngle) < MathTools.NEAR_ZERO)
@@ -1189,9 +1189,9 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
 		}
 		if (br0 != null) {
 		    if (br0.getNext() == component)
-		        prev.setNext(null);
+		        br0.setNext(null);
 		    else if (br0.getPrevious() == component)
-                prev.setPrevious(null);
+		        br0.setPrevious(null);
 		    else if (br0.getBranch0() == component)
 		        br0.setBranch0(null);
 		}