From d4f4feb429beb12aa750f5e69dc6ba88910708d6 Mon Sep 17 00:00:00 2001
From: Lea Anthony <lea.anthony@gmail.com>
Date: Fri, 29 Mar 2019 08:25:09 +1100
Subject: [PATCH] fix: better input during setup

---
 cmd/system.go | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/cmd/system.go b/cmd/system.go
index c9baa48e..78227f85 100644
--- a/cmd/system.go
+++ b/cmd/system.go
@@ -81,21 +81,24 @@ func (s *SystemHelper) BackupConfig() (string, error) {
 
 func (s *SystemHelper) setup() error {
 
+	systemConfig := make(map[string]string)
+
 	// Try to load current values - ignore errors
-	config, err := s.LoadConfig()
-	defaultName := ""
-	defaultEmail := ""
-	if config != nil {
-		defaultName = config.Name
-		defaultEmail = config.Email
+	config, _ := s.LoadConfig()
+
+	if config.Name != "" {
+		systemConfig["name"] = PromptRequired("What is your name", config.Name)
+	} else {
+		systemConfig["name"] = PromptRequired("What is your name")
+	}
+	if config.Email != "" {
+		systemConfig["email"] = PromptRequired("What is your email address", config.Email)
+	} else {
+		systemConfig["email"] = PromptRequired("What is your email address")
 	}
 
-	systemConfig := make(map[string]string)
-	systemConfig["name"] = PromptRequired("What is your name", defaultName)
-	systemConfig["email"] = PromptRequired("What is your email address", defaultEmail)
-
 	// Create the directory
-	err = s.fs.MkDirs(s.wailsSystemDir)
+	err := s.fs.MkDirs(s.wailsSystemDir)
 	if err != nil {
 		return err
 	}