From af54d7f01580c11a180d6467c74cd24d4a8edbb9 Mon Sep 17 00:00:00 2001
From: mjarkk <mkopenga@gmail.com>
Date: Fri, 2 Nov 2018 15:07:10 +0100
Subject: [PATCH] Fixed view not defined error with git push and pull

---
 pkg/gui/commit_message_panel.go |  1 -
 pkg/gui/files_panel.go          | 40 +++++++++++++++++----------------
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/pkg/gui/commit_message_panel.go b/pkg/gui/commit_message_panel.go
index 13ff074bc..3f2225a7b 100644
--- a/pkg/gui/commit_message_panel.go
+++ b/pkg/gui/commit_message_panel.go
@@ -84,7 +84,6 @@ func (gui *Gui) waitForPassUname(g *gocui.Gui, currentView *gocui.View, passOrUn
 
 	// wait for username/passwords input
 	waitForGroup.Wait()
-	_ = gui.switchFocus(g, pushPassUnameView, currentView)
 	return unamePassMessage
 }
 
diff --git a/pkg/gui/files_panel.go b/pkg/gui/files_panel.go
index 757271754..64efd5b9c 100644
--- a/pkg/gui/files_panel.go
+++ b/pkg/gui/files_panel.go
@@ -350,20 +350,21 @@ func (gui *Gui) pullFiles(g *gocui.Gui, v *gocui.View) error {
 			unamePassOpend = true
 			return gui.waitForPassUname(g, v, passOrUname)
 		})
-		if unamePassOpend {
-			_, _ = g.SetViewOnBottom("pushPassUname")
-			_ = g.DeleteView("pushPassUname")
-		}
 		if err != nil {
 			errMessage := err.Error()
 			if errMessage == "exit status 128" {
 				errMessage = gui.Tr.SLocalize("PassUnameWrong")
 			}
-			_ = gui.createErrorPanel(gui.g, errMessage)
-		} else {
-			_ = gui.closeConfirmationPrompt(gui.g)
-			_ = gui.refreshCommits(gui.g)
-			_ = gui.refreshStatus(gui.g)
+			_ = gui.createErrorPanel(g, errMessage)
+		}
+		if unamePassOpend {
+			_, _ = g.SetViewOnBottom("pushPassUname")
+			_ = g.DeleteView("pushPassUname")
+		}
+		if err == nil {
+			_ = gui.closeConfirmationPrompt(g)
+			_ = gui.refreshCommits(g)
+			_ = gui.refreshStatus(g)
 		}
 		gui.refreshFiles(g)
 	}()
@@ -371,7 +372,7 @@ func (gui *Gui) pullFiles(g *gocui.Gui, v *gocui.View) error {
 }
 
 func (gui *Gui) pushWithForceFlag(g *gocui.Gui, v *gocui.View, force bool) error {
-	if err := gui.createMessagePanel(gui.g, v, "", gui.Tr.SLocalize("PushWait")); err != nil {
+	if err := gui.createMessagePanel(g, v, "", gui.Tr.SLocalize("PushWait")); err != nil {
 		return err
 	}
 	go func() {
@@ -381,20 +382,21 @@ func (gui *Gui) pushWithForceFlag(g *gocui.Gui, v *gocui.View, force bool) error
 			unamePassOpend = true
 			return gui.waitForPassUname(g, v, passOrUname)
 		})
-		if unamePassOpend {
-			_, _ = g.SetViewOnBottom("pushPassUname")
-			_ = g.DeleteView("pushPassUname")
-		}
 		if err != nil {
 			errMessage := err.Error()
 			if errMessage == "exit status 128" {
 				errMessage = gui.Tr.SLocalize("PassUnameWrong")
 			}
-			_ = gui.createErrorPanel(gui.g, errMessage)
-		} else {
-			_ = gui.closeConfirmationPrompt(gui.g)
-			_ = gui.refreshCommits(gui.g)
-			_ = gui.refreshStatus(gui.g)
+			_ = gui.createErrorPanel(g, errMessage)
+		}
+		if unamePassOpend {
+			_, _ = g.SetViewOnBottom("pushPassUname")
+			_ = g.DeleteView("pushPassUname")
+		}
+		if err == nil {
+			_ = gui.closeConfirmationPrompt(g)
+			_ = gui.refreshCommits(g)
+			_ = gui.refreshStatus(g)
 		}
 	}()
 	return nil