ConnectionTool fixes for overlapping terminals

[simantics/platform.git] / bundles / org.simantics.diagram / src / org / simantics / diagram / participant / ConnectTool2.java

diff --git a/bundles/org.simantics.diagram/src/org/simantics/diagram/participant/ConnectTool2.java b/bundles/org.simantics.diagram/src/org/simantics/diagram/participant/ConnectTool2.java
index 7d3a5a4005078f314f96d49b931978eabb5ad4c5..38bdc706cb88e8b20a959b03d18bfac02ec17de9 100644 (file)
--- a/bundles/org.simantics.diagram/src/org/simantics/diagram/participant/ConnectTool2.java
+++ b/bundles/org.simantics.diagram/src/org/simantics/diagram/participant/ConnectTool2.java
@@ -577,6 +577,7 @@ public class ConnectTool2 extends AbstractMode {
             }
         } else {
             RouteGraphTarget cp = RouteGraphConnectTool.pickRouteGraphConnection(
+                    getContext(),
                     diagram,
                     pi.getCanvasPickShape(me.controlPosition),
                     pi.getPickDistance());
@@ -601,6 +602,7 @@ public class ConnectTool2 extends AbstractMode {
                     attachToConnectionJudgement = canConnect.first;
                     controlPoints.getLast().setPosition(ti.posDia).setAttachedToTerminal(ti);
                     endTerminal = ti;
+                    startTerminal = canConnect.second;
                     cp.getNode().showBranchPoint(isectPos);
                     if (!endWithoutTerminal(lastMouseCanvasPos, shouldEndWithFlag(me)))
                         updateSG();