Merge pull request tgstation#27527 from cerid/patch-1

sortMerge fix
Chronitonity · May 23, 2017 · 4d0c708 · 4d0c708
2 parents 82d5e8a + 9008f8a
commit 4d0c708
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/code/__HELPERS/sorts/__main.dm b/code/__HELPERS/sorts/__main.dm
@@ -626,14 +626,13 @@ GLOBAL_DATUM_INIT(sortInstance, /datum/sortInstance, new())
 		var/val2 = fetchElement(L,cursor2)
 
 		while(1)
-			if(call(cmp)(val1,val2) < 0)
+			if(call(cmp)(val1,val2) <= 0)
 				if(++cursor1 >= end1)
 					break
 				val1 = fetchElement(L,cursor1)
 			else
 				moveElement(L,cursor2,cursor1)
 
-				++cursor2
 				if(++cursor2 >= end2)
 					break
 				++end1
@@ -653,4 +652,4 @@ GLOBAL_DATUM_INIT(sortInstance, /datum/sortInstance, new())
 #undef MIN_GALLOP
 #undef MIN_MERGE
 
-#undef fetchElement
+#undef fetchElement