From 28e75ebe1a9acc2bc229b234ff5089cda5754038 Mon Sep 17 00:00:00 2001 From: mjarkk Date: Tue, 2 Jul 2019 10:38:36 +0200 Subject: [PATCH 1/2] Fixed the issue --- pkg/gui/view_helpers.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/gui/view_helpers.go b/pkg/gui/view_helpers.go index ba5d0441..87cff475 100644 --- a/pkg/gui/view_helpers.go +++ b/pkg/gui/view_helpers.go @@ -111,7 +111,11 @@ func (gui *Gui) returnFocus(g *gocui.Gui, v *gocui.View) error { // always fall back to services view if there's no 'previous' view stored previousView, err = g.View("services") if err != nil { - gui.Log.Error(err) + // Or fall back to the containers view if we are not in a docker-compose project + previousView, err = g.View("containers") + if err != nil { + gui.Log.Error(err) + } } } return gui.switchFocus(g, v, previousView) From d10410e787cf0b858c766defa02abedd45944604 Mon Sep 17 00:00:00 2001 From: mjarkk Date: Tue, 2 Jul 2019 11:28:19 +0200 Subject: [PATCH 2/2] Fixed a sugestion --- pkg/gui/view_helpers.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkg/gui/view_helpers.go b/pkg/gui/view_helpers.go index 87cff475..ee2360ce 100644 --- a/pkg/gui/view_helpers.go +++ b/pkg/gui/view_helpers.go @@ -109,13 +109,9 @@ func (gui *Gui) returnFocus(g *gocui.Gui, v *gocui.View) error { previousView, err := g.View(gui.State.PreviousView) if err != nil { // always fall back to services view if there's no 'previous' view stored - previousView, err = g.View("services") + previousView, err = g.View(gui.initiallyFocusedViewName()) if err != nil { - // Or fall back to the containers view if we are not in a docker-compose project - previousView, err = g.View("containers") - if err != nil { - gui.Log.Error(err) - } + gui.Log.Error(err) } } return gui.switchFocus(g, v, previousView)