Implement continuous evaluation behavior

mkchoi212 · Jun 9, 2018 · 6f59a29 · 6f59a29
1 parent 3fb2cca
commit 6f59a29
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/layout.go b/layout.go
@@ -258,7 +258,7 @@ func Move(g *gocui.Gui, v *gocui.View, direction int) error {
 
 	// Quit application if all items are resolved
 	if originalCur == cur && conflicts[cur].Choice != 0 {
-		globalQuit(g)
+		globalQuit(g, gocui.ErrQuit)
 	}
 
 	Select(g, conflicts[cur], false)

diff --git a/main.go b/main.go
@@ -23,9 +23,9 @@ var (
 
 // globalQuit is invoked when the user quits the contact and or
 // when all conflicts have been resolved
-func globalQuit(g *gocui.Gui) {
+func globalQuit(g *gocui.Gui, err error) {
 	g.Update(func(g *gocui.Gui) error {
-		return gocui.ErrQuit
+		return err
 	})
 }