more cleanups

1 files changed, 12 insertions, 7 deletions

diff --git a/main.go b/main.go
index a732e14..5ec2f5c 100644
--- a/main.go
+++ b/main.go
@@ -7,6 +7,7 @@ import (
 	"time"
 
 	"go.wit.com/dev/alexflint/arg"
+	"go.wit.com/gui"
 	"go.wit.com/lib/gui/shell"
 	"go.wit.com/lib/protobuf/forgepb"
 	"go.wit.com/lib/protobuf/gitpb"
@@ -158,13 +159,17 @@ func main() {
 		okExit("patches")
 	}
 
-	// do the gui at the very end
-	if argv.DoGui {
-		doGui()
-	}
-	if !done {
-		// if nothing was selected, print out a table of them on STDOUT
-		doCobol()
+	// if the user doesn't want to open the GUI and
+	// nothing else was specified to be done,
+	// then just list the table to stdout
+	if gui.NoGui() {
+		if !done {
+			// if nothing was selected, print out a table of them on STDOUT
+			doCobol()
+			okExit("")
+		}
 	}
+	// open the gui
+	doGui()
 	okExit("")
 }