From 681eb39690cbefad581abe48515cf91fa82fdbe7 Mon Sep 17 00:00:00 2001 From: Mark D Horn Date: Mon, 8 Oct 2018 18:07:43 -0700 Subject: [PATCH] Do not change default for Escape-Cancel Two of the Enable/Disable configuration options were assuming Confirm was enabled; otherwise disable. Escape to cancel should not change the default answer. Signed-off-by: Mark D Horn --- tui/autoupdate.go | 2 +- tui/telemetry.go | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/tui/autoupdate.go b/tui/autoupdate.go index 116f5a6..d04c789 100644 --- a/tui/autoupdate.go +++ b/tui/autoupdate.go @@ -65,7 +65,7 @@ func (aup *AutoUpdatePage) DeActivate() { if aup.action == ActionConfirmButton { model.AutoUpdate = true - } else { + } else if aup.action == ActionBackButton { model.AutoUpdate = false } } diff --git a/tui/telemetry.go b/tui/telemetry.go index 5140c18..d09482e 100644 --- a/tui/telemetry.go +++ b/tui/telemetry.go @@ -83,7 +83,14 @@ func newTelemetryPage(tui *Tui) (Page, error) { // DeActivate sets the model value and adjusts the "confirm" flag for this page func (tp *TelemetryPage) DeActivate() { - tp.getModel().EnableTelemetry(tp.action == ActionConfirmButton) + model := tp.getModel() + + if tp.action == ActionConfirmButton { + model.EnableTelemetry(true) + } else if tp.action == ActionBackButton { + model.EnableTelemetry(false) + } + tp.SetDone(true) }