From 4b421a4a87478aab8ff359746f0e9ce0dc9eca93 Mon Sep 17 00:00:00 2001 From: veeso Date: Sat, 29 Jan 2022 19:26:37 +0100 Subject: [PATCH] issue 94: color not reset after leaving text editor (SORCERY!!!) --- src/ui/activities/filetransfer/actions/edit.rs | 7 ++++--- src/ui/activities/setup/actions.rs | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/ui/activities/filetransfer/actions/edit.rs b/src/ui/activities/filetransfer/actions/edit.rs index efe7827..8bbdaa8 100644 --- a/src/ui/activities/filetransfer/actions/edit.rs +++ b/src/ui/activities/filetransfer/actions/edit.rs @@ -124,9 +124,6 @@ impl FileTransferActivity { Err(err) => return Err(format!("Could not open editor: {}", err)), } if let Some(ctx) = self.context.as_mut() { - if let Err(err) = ctx.terminal().clear_screen() { - error!("Could not clear screen screen: {}", err); - } // Enter alternate mode if let Err(err) = ctx.terminal().enter_alternate_screen() { error!("Could not enter alternate screen: {}", err); @@ -135,6 +132,10 @@ impl FileTransferActivity { if let Err(err) = ctx.terminal().enable_raw_mode() { error!("Failed to enter raw mode: {}", err); } + // Clear screens + if let Err(err) = ctx.terminal().clear_screen() { + error!("Could not clear screen screen: {}", err); + } // Unlock ports assert!(self.app.unlock_ports().is_ok()); } diff --git a/src/ui/activities/setup/actions.rs b/src/ui/activities/setup/actions.rs index ef9dd90..0930992 100644 --- a/src/ui/activities/setup/actions.rs +++ b/src/ui/activities/setup/actions.rs @@ -194,9 +194,6 @@ impl SetupActivity { } // Restore terminal if let Some(ctx) = self.context.as_mut() { - if let Err(err) = ctx.terminal().clear_screen() { - error!("Could not clear screen screen: {}", err); - } // Enter alternate mode if let Err(err) = ctx.terminal().enter_alternate_screen() { error!("Could not enter alternate screen: {}", err); @@ -205,6 +202,9 @@ impl SetupActivity { if let Err(err) = ctx.terminal().enable_raw_mode() { error!("Failed to enter raw mode: {}", err); } + if let Err(err) = ctx.terminal().clear_screen() { + error!("Could not clear screen screen: {}", err); + } // Unlock ports assert!(self.app.unlock_ports().is_ok()); }