Index: lams_central/web/includes/javascript/authoring/authoringActivity.js
===================================================================
diff -u -rca9b0a623a0482a1a9144a3f4309622c37c6fc65 -rac1d78c2a1ad6d2fea544c76e089c75b6e11f874
--- lams_central/web/includes/javascript/authoring/authoringActivity.js	(.../authoringActivity.js)	(revision ca9b0a623a0482a1a9144a3f4309622c37c6fc65)
+++ lams_central/web/includes/javascript/authoring/authoringActivity.js	(.../authoringActivity.js)	(revision ac1d78c2a1ad6d2fea544c76e089c75b6e11f874)
@@ -743,7 +743,8 @@
 		}
 		this.items = paper.g();
 		
-		var points = ActivityLib.findTransitionPoints(this.fromActivity, this.toActivity),
+		var isBranching = this.fromActivity instanceof ActivityDefs.BranchingEdgeActivity || this.toActivity instanceof ActivityDefs.BranchingEdgeActivity,
+			points = ActivityLib.findTransitionPoints(this.fromActivity, this.toActivity),
 			curve = layout.transition.curve,
 			threshold = 2 * curve + 2;
 		
@@ -754,8 +755,9 @@
 	
 			
 			// if activities are too close for curves, draw a straight line instead of bezier
-			if (Math.abs(horizontalDelta) < threshold || Math.abs(verticalDelta) < threshold) {
+			if (isBranching || Math.abs(horizontalDelta) < threshold || Math.abs(verticalDelta) < threshold) {
 				path += Snap.format(' L {endX} {endY}', points);
+				this.straightLine = true;
 			} else {
 				// adjust according to whether it is right/left and down/up
 				var horizontalModifier = horizontalDelta > 0 ? 1 : -1,