From 82a9d296971b513c0add9be4eb19396e4e05ab3e Mon Sep 17 00:00:00 2001
From: Daisuke Maki <lestrrat+github@gmail.com>
Date: Sat, 22 Oct 2016 10:34:05 +0900
Subject: [PATCH] Move the fail-safe notify sync.Once call to a defer, so we
 don't have to remember calling it

---
 source.go | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/source.go b/source.go
index c8e3711..aeb0dfe 100644
--- a/source.go
+++ b/source.go
@@ -75,6 +75,12 @@ func (s *Source) Setup(ctx context.Context, state *Peco) {
 			state.Hub().SendStatusMsg("")
 			close(s.ready)
 		}
+
+		// Register this to be called in a defer, just in case we could bailed
+		// out without reading a single line.
+		// Note: this will be a no-op if notify.Do has been called before
+		defer notify.Do(notifycb)
+
 		scanner := bufio.NewScanner(s.in)
 		defer func() {
 			if util.IsTty(s.in) {
@@ -102,7 +108,6 @@ func (s *Source) Setup(ctx context.Context, state *Peco) {
 				if pdebug.Enabled {
 					pdebug.Printf("Bailing out of source setup, because ctx was canceled")
 				}
-				notify.Do(notifycb)
 				return
 			case l, ok := <-lines:
 				if !ok {
@@ -117,10 +122,6 @@ func (s *Source) Setup(ctx context.Context, state *Peco) {
 				notify.Do(notifycb)
 			}
 		}
-		// Call this after the for loop, just in case scanner.Scan()
-		// did not return a single line.
-		// Note: this will be a no-op if notify.Do has been called before
-		notify.Do(notifycb)
 
 		if pdebug.Enabled {
 			pdebug.Printf("Read all %d lines from source", readCount)