From d0a9a7317613533cdfef3ee50e6ae507951e46f0 Mon Sep 17 00:00:00 2001
From: Cyp <cyp561@gmail.com>
Date: Fri, 27 Mar 2009 21:40:19 +0100
Subject: [PATCH] Fix last fix...

Order of operations didn't make sense. If set to true, the flag would be reset to false. Oops.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
---
 src/lanes.cpp | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/lanes.cpp b/src/lanes.cpp
index 495575b..335822e 100644
--- a/src/lanes.cpp
+++ b/src/lanes.cpp
@@ -120,27 +120,19 @@ void Lanes::setMerge(const QStringList& parents) {
 		int idx = findNextSha(*it, 0);
 		if (idx != -1) {
 
-			if (typeVec[idx] == CROSS) {
-
-				if(idx >= rangeEnd)
-					endJoinWasACross = true;
-				if(idx <= rangeStart)
-					startJoinWasACross = true;
-			}
-
-			typeVec[idx] = JOIN;
-
 			if (idx > rangeEnd) {
 
 				rangeEnd = idx;
-				endJoinWasACross = false;
+				endJoinWasACross = typeVec[idx] == CROSS;
 			}
 
 			if (idx < rangeStart) {
 
 				rangeStart = idx;
-				startJoinWasACross = false;
+				startJoinWasACross = typeVec[idx] == CROSS;
 			}
+
+			typeVec[idx] = JOIN;
 		} else
 			rangeEnd = add(HEAD, *it, rangeEnd + 1);
 	}
-- 
2.11.4.GIT