From 7e0a8f235ef6971a98fba9c91c7fa159ca842180 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Sat, 16 Nov 2019 12:41:04 +1100 Subject: add contexts to views --- pkg/gui/view_helpers.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkg/gui/view_helpers.go') diff --git a/pkg/gui/view_helpers.go b/pkg/gui/view_helpers.go index ec1b3f647..a8e4872e1 100644 --- a/pkg/gui/view_helpers.go +++ b/pkg/gui/view_helpers.go @@ -117,7 +117,7 @@ func (gui *Gui) newLineFocused(g *gocui.Gui, v *gocui.View) error { case "credentials": return gui.handleCredentialsViewFocused(g, v) case "main": - if gui.State.Context == "merging" { + if gui.State.MainContext == "merging" { return gui.refreshMergePanel() } v.Highlight = false @@ -406,7 +406,7 @@ func (gui *Gui) renderPanelOptions() error { case "menu": return gui.renderMenuOptions() case "main": - if gui.State.Context == "merging" { + if gui.State.MainContext == "merging" { return gui.renderMergeOptions() } } -- cgit v1.2.3