issue 94: color not reset after leaving text editor (SORCERY!!!)

This commit is contained in:
veeso
2022-01-29 19:26:37 +01:00
parent 0fe06eb52b
commit 4b421a4a87
2 changed files with 7 additions and 6 deletions

View File

@@ -124,9 +124,6 @@ impl FileTransferActivity {
Err(err) => return Err(format!("Could not open editor: {}", err)), Err(err) => return Err(format!("Could not open editor: {}", err)),
} }
if let Some(ctx) = self.context.as_mut() { 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 // Enter alternate mode
if let Err(err) = ctx.terminal().enter_alternate_screen() { if let Err(err) = ctx.terminal().enter_alternate_screen() {
error!("Could not enter alternate screen: {}", err); error!("Could not enter alternate screen: {}", err);
@@ -135,6 +132,10 @@ impl FileTransferActivity {
if let Err(err) = ctx.terminal().enable_raw_mode() { if let Err(err) = ctx.terminal().enable_raw_mode() {
error!("Failed to enter raw mode: {}", err); 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 // Unlock ports
assert!(self.app.unlock_ports().is_ok()); assert!(self.app.unlock_ports().is_ok());
} }

View File

@@ -194,9 +194,6 @@ impl SetupActivity {
} }
// Restore terminal // Restore terminal
if let Some(ctx) = self.context.as_mut() { 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 // Enter alternate mode
if let Err(err) = ctx.terminal().enter_alternate_screen() { if let Err(err) = ctx.terminal().enter_alternate_screen() {
error!("Could not enter alternate screen: {}", err); error!("Could not enter alternate screen: {}", err);
@@ -205,6 +202,9 @@ impl SetupActivity {
if let Err(err) = ctx.terminal().enable_raw_mode() { if let Err(err) = ctx.terminal().enable_raw_mode() {
error!("Failed to enter raw mode: {}", err); error!("Failed to enter raw mode: {}", err);
} }
if let Err(err) = ctx.terminal().clear_screen() {
error!("Could not clear screen screen: {}", err);
}
// Unlock ports // Unlock ports
assert!(self.app.unlock_ports().is_ok()); assert!(self.app.unlock_ports().is_ok());
} }