diff --git a/src/converter.rs b/src/converter.rs index 177aa36..fd62eb3 100644 --- a/src/converter.rs +++ b/src/converter.rs @@ -72,7 +72,7 @@ pub async fn run_conversion_loop( picker: Picker, prerender: usize, shms_work: bool -) -> Result<(), SendError>> { +) -> Result<(), Box>>> { let mut images = vec![]; let mut page: usize = 0; let pid = std::process::id(); diff --git a/src/tui.rs b/src/tui.rs index 707823d..d47cc0f 100644 --- a/src/tui.rs +++ b/src/tui.rs @@ -739,19 +739,19 @@ impl Tui { InputAction::Redraw.into() } KeyCode::Char(c) - if let BottomMessage::Input(InputCommand::GoToPage(ref mut page)) = - self.bottom_msg && matches!(c, 'g' if self.is_kitty) => - c.to_digit(10).map(|input_num| { - *page = (*page * 10) + input_num as usize; - InputAction::Redraw - }), - KeyCode::Char(_) if let BottomMessage::Input(InputCommand::GoToPage(_)) = - self.bottom_msg => + self.bottom_msg && matches!(c, 'g' if self.is_kitty) => { self.set_msg(MessageSetting::Pop); self.update_zoom(Zoom::pan_bottom) } + KeyCode::Char(c) + if let BottomMessage::Input(InputCommand::GoToPage(ref mut page)) = + self.bottom_msg => + c.to_digit(10).map(|input_num| { + *page = (*page * 10) + input_num as usize; + InputAction::Redraw + }), KeyCode::Char(c) => match c { 'l' => self.change_page(PageChange::Next, ChangeAmount::Single), 'j' => self.change_page(PageChange::Next, ChangeAmount::WholeScreen),