diff options
author | mjarkk <mkopenga@gmail.com> | 2018-11-02 15:07:10 +0100 |
---|---|---|
committer | mjarkk <mkopenga@gmail.com> | 2018-11-02 15:07:10 +0100 |
commit | af54d7f01580c11a180d6467c74cd24d4a8edbb9 (patch) | |
tree | da42200078ab9d110a6b524f855acc8097b1eda4 /pkg/gui/files_panel.go | |
parent | cb9ad5bc730f3f4ffe5f1d6c1aeff74e354c4962 (diff) |
Fixed view not defined error with git push and pull
Diffstat (limited to 'pkg/gui/files_panel.go')
-rw-r--r-- | pkg/gui/files_panel.go | 40 |
1 files changed, 21 insertions, 19 deletions
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 |