From 9dbf6b02d24b52ae43e36905bbb1e83087e1dfe9 Mon Sep 17 00:00:00 2001
From: Junegunn Choi <junegunn.c@gmail.com>
Date: Sun, 11 Jan 2015 23:49:12 +0900
Subject: Fix race conditions

- Wait for completions of goroutines when cancelling a search
- Remove shared access to rank field of Item
---
 src/merger.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/merger.go')

diff --git a/src/merger.go b/src/merger.go
index 08a3d154..16afdafc 100644
--- a/src/merger.go
+++ b/src/merger.go
@@ -57,7 +57,7 @@ func (mg *Merger) mergedGet(idx int) *Item {
 				continue
 			}
 			if cursor >= 0 {
-				rank := list[cursor].Rank()
+				rank := list[cursor].Rank(false)
 				if minIdx < 0 || compareRanks(rank, minRank) {
 					minRank = rank
 					minIdx = listIdx
-- 
cgit v1.2.3