From b56b3aaa5608dff8290b3cb3718498befd18fd1c Mon Sep 17 00:00:00 2001 From: Dheepak Krishnamurthy Date: Wed, 10 Nov 2021 07:09:05 -0700 Subject: [PATCH] fix: Resolve crash due to incorrect error state --- src/app.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/app.rs b/src/app.rs index a9c94e3..4d0c4fe 100644 --- a/src/app.rs +++ b/src/app.rs @@ -549,7 +549,7 @@ impl TaskwarriorTui { false, self.error.clone(), ); - let text = self.error.clone().unwrap(); + let text = self.error.clone().unwrap_or_else(|| "Unknown error.".to_string()); let title = vec![Span::styled("Error", Style::default().add_modifier(Modifier::BOLD))]; let rect = centered_rect(90, 60, f.size()); f.render_widget(Clear, rect); @@ -1649,6 +1649,10 @@ impl TaskwarriorTui { if let Ok(imported) = import(data.as_bytes()) { self.tasks = imported; self.error = None; + if self.mode == Mode::Tasks(Action::Error) { + self.mode = self.previous_mode.clone().unwrap_or(Mode::Tasks(Action::Report)); + self.previous_mode = None; + } } } else { self.error = Some(format!(