From 0332375c156525c5ae6821552d7be719fb3dd76f Mon Sep 17 00:00:00 2001
From: Bruno <bruno@stilingue.com.br>
Date: Wed, 16 Oct 2019 20:34:54 -0300
Subject: [PATCH 1/3] Change "Terminated" to "Terminating"

---
 internal/resource/container.go | 2 +-
 internal/resource/pod.go       | 2 +-
 internal/views/colorer.go      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/internal/resource/container.go b/internal/resource/container.go
index cb47b49448..69ad324e6a 100644
--- a/internal/resource/container.go
+++ b/internal/resource/container.go
@@ -231,7 +231,7 @@ func toState(s v1.ContainerState) string {
 		if s.Terminated.Reason != "" {
 			return s.Terminated.Reason
 		}
-		return "Terminated"
+		return "Terminating"
 	case s.Running != nil:
 		return "Running"
 	default:
diff --git a/internal/resource/pod.go b/internal/resource/pod.go
index 53a2ceb96d..af2061d414 100644
--- a/internal/resource/pod.go
+++ b/internal/resource/pod.go
@@ -407,7 +407,7 @@ func (r *Pod) phase(po *v1.Pod) string {
 		return status
 	}
 
-	return "Terminated"
+	return "Terminating"
 }
 
 func (*Pod) containerPhase(st v1.PodStatus, status string) (bool, string) {
diff --git a/internal/views/colorer.go b/internal/views/colorer.go
index 312b264489..48b89bb1b8 100644
--- a/internal/views/colorer.go
+++ b/internal/views/colorer.go
@@ -55,7 +55,7 @@ func podColorer(ns string, r *resource.RowEvent) tcell.Color {
 	switch strings.TrimSpace(r.Fields[statusCol]) {
 	case "ContainerCreating", "PodInitializing":
 		return ui.AddColor
-	case "Terminating", "Initialized":
+	case "Initialized":
 		return ui.HighlightColor
 	case "Completed":
 		return ui.CompletedColor

From 36dbe2eed6f90f60a75c7e4e1b9a1d0e5bc76c9d Mon Sep 17 00:00:00 2001
From: Bruno <bruno_h_m_s@hotmail.com>
Date: Wed, 16 Oct 2019 21:11:58 -0300
Subject: [PATCH 2/3] Fix Tests

---
 internal/resource/container_test.go | 4 ++--
 internal/resource/pod_int_test.go   | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/internal/resource/container_test.go b/internal/resource/container_test.go
index 9274e6bfc6..5e4458ed18 100644
--- a/internal/resource/container_test.go
+++ b/internal/resource/container_test.go
@@ -83,9 +83,9 @@ func TestToState(t *testing.T) {
 			v1.ContainerState{Waiting: &v1.ContainerStateWaiting{Reason: "blee"}},
 			"blee",
 		},
-		"terminated": {
+		"terminating": {
 			v1.ContainerState{Terminated: &v1.ContainerStateTerminated{}},
-			"Terminated",
+			"Terminating",
 		},
 		"terminatedReason": {
 			v1.ContainerState{Terminated: &v1.ContainerStateTerminated{Reason: "blee"}},
diff --git a/internal/resource/pod_int_test.go b/internal/resource/pod_int_test.go
index 784d85351a..b332bcc4ce 100644
--- a/internal/resource/pod_int_test.go
+++ b/internal/resource/pod_int_test.go
@@ -66,11 +66,11 @@ func TestPodPhase(t *testing.T) {
 		{makePodCoInitWaiting("p1", "PodInitializing"), "Init:0/1"},
 		{makePodCoWaiting("p1", "Waiting"), "Waiting"},
 		{makePodCoWaiting("p1", ""), ""},
-		{makePodCoTerminated("p1", "OOMKilled", 0, true), "Terminated"},
+		{makePodCoTerminated("p1", "OOMKilled", 0, true), "Terminating"},
 		{makePodCoTerminated("p1", "OOMKilled", 0, false), "OOMKilled"},
-		{makePodCoTerminated("p1", "", 0, true), "Terminated"},
+		{makePodCoTerminated("p1", "", 0, true), "Terminating"},
 		{makePodCoTerminated("p1", "", 0, false), "ExitCode:1"},
-		{makePodCoTerminated("p1", "", 1, true), "Terminated"},
+		{makePodCoTerminated("p1", "", 1, true), "Terminating"},
 		{makePodCoTerminated("p1", "", 1, false), "Signal:1"},
 	}
 

From 21df6e5939ca69b7548f2604077d8dd081582b33 Mon Sep 17 00:00:00 2001
From: Gustavo Paiva <guustavo.paiva@gmail.com>
Date: Wed, 16 Oct 2019 01:10:40 -0300
Subject: [PATCH 3/3] disable header toggle when buffer is active.

---
 internal/views/app.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/internal/views/app.go b/internal/views/app.go
index c0cc39e861..ea56e453c5 100644
--- a/internal/views/app.go
+++ b/internal/views/app.go
@@ -350,6 +350,10 @@ func (a *appView) setIndicator(l ui.FlashLevel, msg string) {
 }
 
 func (a *appView) toggleHeaderCmd(evt *tcell.EventKey) *tcell.EventKey {
+	if a.Cmd().InCmdMode() {
+		return evt
+	}
+
 	a.showHeader = !a.showHeader
 	a.toggleHeader(a.showHeader)
 	a.Draw()