From: Marko Luukkainen <marko.luukkainen@semantum.fi>
Date: Tue, 13 Aug 2019 15:29:02 +0000 (+0300)
Subject: Additional fix to control point synchronization
X-Git-Tag: v1.43.0~226^2~2
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=9a39fbf9e01c46b859b6c695930081b0eb6b2842;p=simantics%2F3d.git

Additional fix to control point synchronization

gitlab #24

Change-Id: Id0fdaceeafc95495ad7ae7365f44214903b47bea
---

diff --git a/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/PipelineComponent.java b/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/PipelineComponent.java
index 36c6dde1..06944b53 100644
--- a/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/PipelineComponent.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/PipelineComponent.java
@@ -88,8 +88,8 @@ public abstract class PipelineComponent extends GeometryNode {
 	public void setNext(PipelineComponent comp) {
 		if (next == comp)
 			return;
-		if (comp == null)
-            this.next._removeRef(this);
+		if (this.next != null)
+		    this.next._removeRef(this);
 		this.next = comp;
 		this.syncnext = false;
 		syncNext();
@@ -109,7 +109,7 @@ public abstract class PipelineComponent extends GeometryNode {
 	public void setPrevious(PipelineComponent comp) {
 		if (previous == comp)
 			return;
-		if (comp == null)
+		if (this.previous != null)
 		    this.previous._removeRef(this);
 		this.previous = comp;
 		this.syncprev = false;
@@ -130,8 +130,8 @@ public abstract class PipelineComponent extends GeometryNode {
 	public void setBranch0(PipelineComponent comp) {
 		if (branch0 == comp)
 			return;
-		if (comp == null)
-            this.branch0._removeRef(this);
+		if (this.branch0 != null)
+		    this.branch0._removeRef(this);
 		this.branch0 = comp;
 		this.syncbr0 = false;
 		syncBranch0();