From 390b7ddc5e92564bc9e71b83c600a778fbefd54a Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Tue, 6 Apr 2021 09:50:09 +1000
Subject: [PATCH] change order of filtering and patch building so that esc key
 exits patch building mode first

---
 pkg/gui/modes.go | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkg/gui/modes.go b/pkg/gui/modes.go
index 5f783c4eb..f97e050cf 100644
--- a/pkg/gui/modes.go
+++ b/pkg/gui/modes.go
@@ -25,17 +25,6 @@ func (gui *Gui) modeStatuses() []modeStatus {
 			},
 			reset: gui.exitDiffMode,
 		},
-		{
-			isActive: gui.State.Modes.Filtering.Active,
-			description: func() string {
-				return utils.ColoredString(
-					fmt.Sprintf("%s '%s' %s", gui.Tr.LcFilteringBy, gui.State.Modes.Filtering.GetPath(), utils.ColoredString(gui.Tr.ResetInParentheses, color.Underline)),
-					color.FgRed,
-					color.Bold,
-				)
-			},
-			reset: gui.exitFilterMode,
-		},
 		{
 			isActive: gui.GitCommand.PatchManager.Active,
 			description: func() string {
@@ -47,6 +36,17 @@ func (gui *Gui) modeStatuses() []modeStatus {
 			},
 			reset: gui.handleResetPatch,
 		},
+		{
+			isActive: gui.State.Modes.Filtering.Active,
+			description: func() string {
+				return utils.ColoredString(
+					fmt.Sprintf("%s '%s' %s", gui.Tr.LcFilteringBy, gui.State.Modes.Filtering.GetPath(), utils.ColoredString(gui.Tr.ResetInParentheses, color.Underline)),
+					color.FgRed,
+					color.Bold,
+				)
+			},
+			reset: gui.exitFilterMode,
+		},
 		{
 			isActive: gui.State.Modes.CherryPicking.Active,
 			description: func() string {