diff options
Diffstat (limited to 'pkg/gui/files_panel.go')
| -rw-r--r-- | pkg/gui/files_panel.go | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/pkg/gui/files_panel.go b/pkg/gui/files_panel.go index 7942e421b..127a0d96a 100644 --- a/pkg/gui/files_panel.go +++ b/pkg/gui/files_panel.go @@ -394,12 +394,13 @@ func (gui *Gui) pullFiles(g *gocui.Gui, v *gocui.View) error { errMessage = gui.Tr.SLocalize("PassUnameWrong") } _ = gui.createErrorPanel(g, errMessage) - } - if unamePassOpend { - _, _ = g.SetViewOnBottom("pushPassUname") - _ = g.DeleteView("pushPassUname") - } - if err == nil { + if unamePassOpend { + _ = g.DeleteView("pushPassUname") + } + } else { + if unamePassOpend { + _ = g.DeleteView("pushPassUname") + } _ = gui.closeConfirmationPrompt(g) _ = gui.refreshCommits(g) _ = gui.refreshStatus(g) @@ -426,12 +427,13 @@ func (gui *Gui) pushWithForceFlag(g *gocui.Gui, v *gocui.View, force bool) error errMessage = gui.Tr.SLocalize("PassUnameWrong") } _ = gui.createErrorPanel(g, errMessage) - } - if unamePassOpend { - _, _ = g.SetViewOnBottom("pushPassUname") - _ = g.DeleteView("pushPassUname") - } - if err == nil { + if unamePassOpend { + _ = g.DeleteView("pushPassUname") + } + } else { + if unamePassOpend { + _ = g.DeleteView("pushPassUname") + } _ = gui.closeConfirmationPrompt(g) _ = gui.refreshSidePanels(g) } |