From a5a07f4149e069311d72bcf7c574d7b89f35b0d8 Mon Sep 17 00:00:00 2001
From: Syndamia <kamen.d.mladenov@protonmail.com>
Date: Sat, 11 Sep 2021 18:18:29 +0300
Subject: Fixed formWindow skipping values before the last wrongly inputted
 value

---
 go-src/windows.go | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

(limited to 'go-src/windows.go')

diff --git a/go-src/windows.go b/go-src/windows.go
index 89294a1..73f8733 100644
--- a/go-src/windows.go
+++ b/go-src/windows.go
@@ -32,16 +32,14 @@ func StartupWindow(...string) {
 
 func loginWindow(values ...string) {
 	// Takes form user input
-	inputs := formWindow(loginNavTitle, StartupWindow,
+	var inputs []string
+	formWindow(loginNavTitle, StartupWindow,
 		[]formInput{
 			{usernameInName, inputBackSpec, nil},
 			{passwordInName, "", nil},
 		},
-		values...,
+		&inputs,
 	)
-	if len(inputs) == 0 {
-		return
-	}
 
 	if !usernameExists(inputs[0]) {
 		defer showError(valueDoesNotExist(usernameInName), loginWindow)
@@ -56,17 +54,16 @@ func loginWindow(values ...string) {
 }
 
 func registerWindow(values ...string) {
-	inputs := formWindow(registerNavTitle, StartupWindow,
+	var inputs []string
+	formWindow(registerNavTitle, StartupWindow,
 		[]formInput{
 			{usernameInName, usernameSpec, stringValidUsername},
 			{passwordInName, passwordSpec, stringValidPassword},
 			{nameInName, nameSpec, stringValidName},
 		},
-		values...,
+		&inputs,
 	)
-	if len(inputs) == 0 {
-		return
-	}
+
 	if usernameExists(inputs[0]) {
 		defer showError(valueAlreadyTaken(usernameInName), registerWindow, values...)
 		return
@@ -126,16 +123,14 @@ func chatsWindow(values ...string) {
 }
 
 func createChatWindow(values ...string) {
-	inputs := formWindow(createChatNavTitle, chatsWindow,
+	var inputs []string
+	formWindow(createChatNavTitle, chatsWindow,
 		[]formInput{
 			{chatNameInName, chatNameSpec, stringValidChatName},
 			{chatDescInName, chatDescSpec, stringValidChatDesc},
 		},
-		values...,
+		&inputs,
 	)
-	if len(inputs) == 0 {
-		return
-	}
 	if chatNameExists(inputs[0]) {
 		defer showError(valueAlreadyTaken(chatNameInName), createChatWindow, values...)
 		return
-- 
cgit v1.2.3