merge master

2015-09-21 14:59:16 -06:00 · 2015-09-21 14:59:16 -06:00 · 2cdac0154b
commit 2cdac0154b
parent 9e6a5d3d6e d3b149c3c9
1 changed files with 4 additions and 2 deletions
--- a/lfs/transfer_queue.go
+++ b/lfs/transfer_queue.go
@ -90,12 +90,14 @@ func (q *TransferQueue) Wait() {
 	q.retrywait.Wait()
 	atomic.StoreUint32(&q.retrying, 1)

-	if len(q.retries) > 0 && q.batcher != nil {
+	if len(q.retries) > 0 {
 		tracerx.Printf("tq: retrying %d failed transfers", len(q.retries))
 		for _, t := range q.retries {
 			q.Add(t)
 		}
-		q.batcher.Exit()
+		if q.batcher != nil {
+			q.batcher.Exit()
+		}
 		q.wait.Wait()
 	}