diff --git a/src/lib.rs b/src/lib.rs index 24f11a35..5586c27c 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -62,7 +62,7 @@ fn try_drawing( painter: &mut canvas::Painter, ) -> anyhow::Result<()> { if let Err(err) = painter.draw_data(terminal, app) { - cleanup_terminal(terminal, &app.app_config_fields)?; + cleanup_terminal(terminal)?; Err(err.into()) } else { Ok(()) @@ -71,14 +71,13 @@ fn try_drawing( /// Clean up the terminal before returning it to the user. fn cleanup_terminal( - terminal: &mut Terminal>, app_config_fields: &AppConfigFields, + terminal: &mut Terminal>, ) -> anyhow::Result<()> { disable_raw_mode()?; - if app_config_fields.disable_click { - execute!(terminal.backend_mut(), DisableMouseCapture)?; - } + execute!( terminal.backend_mut(), + DisableMouseCapture, DisableBracketedPaste, LeaveAlternateScreen, Show, @@ -457,7 +456,7 @@ pub fn start_bottom(enable_error_hook: &mut bool) -> anyhow::Result<()> { // I think doing it in this order is safe... // TODO: maybe move the cancellation token to the ctrl-c handler? cancellation_token.cancel(); - cleanup_terminal(&mut terminal, &app.app_config_fields)?; + cleanup_terminal(&mut terminal)?; Ok(()) }