cmd/client.go

@@ -65,6 +65,9 @@ func setClientParameters(cmd *cobra.Command) error {
 	}
 
 	ascii, err := cmd.Flags().GetBool("ascii")
+	if err != nil {
+		return err
+	}
 	if ascii == true {
 		useASCII = true
 	}

cmd/clientFunc.go

@@ -116,13 +116,8 @@ func listenMessages(g *gocui.Gui) {
 	for {
 		messageFromServer, _, err := receiveMessage(data.Server)
 		if err != nil {
-			// What the hell is this
-			if err == gocui.ErrQuit {
-				g.Close()
-			} else {
-				g.Close()
-				os.Exit(1)
-			}
+			g.Close()
+			os.Exit(0)
 		}
 
 		formattedMessage := strings.TrimRight(messageFromServer, "\n")