From 83a0fb65f69a95de47e8178edd03a3ed519f33df Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Fri, 2 Apr 2021 20:48:22 +1100
Subject: [PATCH] fix bug where we had two sets of contexts with their own
 state

---
 pkg/gui/list_context.go | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/pkg/gui/list_context.go b/pkg/gui/list_context.go
index c067e652f..7f78f5a97 100644
--- a/pkg/gui/list_context.go
+++ b/pkg/gui/list_context.go
@@ -530,19 +530,20 @@ func (gui *Gui) suggestionsListContext() *ListContext {
 
 func (gui *Gui) getListContexts() []*ListContext {
 	return []*ListContext{
-		gui.menuListContext(),
-		gui.filesListContext(),
-		gui.branchesListContext(),
-		gui.remotesListContext(),
-		gui.remoteBranchesListContext(),
-		gui.tagsListContext(),
-		gui.branchCommitsListContext(),
-		gui.reflogCommitsListContext(),
-		gui.subCommitsListContext(),
-		gui.stashListContext(),
-		gui.commitFilesListContext(),
-		gui.submodulesListContext(),
-		gui.suggestionsListContext(),
+		gui.Contexts.Menu.Context.(*ListContext),
+		gui.Contexts.Files.Context.(*ListContext),
+		gui.Contexts.Branches.Context.(*ListContext),
+		gui.Contexts.Remotes.Context.(*ListContext),
+		gui.Contexts.Remotes.Branches.Context.(*ListContext),
+		gui.Contexts.Tags.Context.(*ListContext),
+		gui.Contexts.BranchCommits.Context.(*ListContext),
+		gui.Contexts.BranchCommits.Context.(*ListContext),
+		gui.Contexts.ReflogCommits.Context.(*ListContext),
+		gui.Contexts.SubCommits.Context.(*ListContext),
+		gui.Contexts.Stash.Context.(*ListContext),
+		gui.Contexts.CommitFiles.Context.(*ListContext),
+		gui.Contexts.Submodules.Context.(*ListContext),
+		gui.Contexts.Suggestions.Context.(*ListContext),
 	}
 }