fixed warning about undefined keyv1.2.0

3 files changed, 12 insertions, 6 deletions

diff --git a/src/file_browser.rs b/src/file_browser.rs
index 45c99df..51afd13 100644
--- a/src/file_browser.rs
+++ b/src/file_browser.rs
@@ -1,4 +1,4 @@
-use termion::event::Key;
+use termion::event::{Event, Key};
 use pathbuftools::PathBufTools;
 use osstrtools::OsStrTools;
 use async_value::Stale;
@@ -1283,7 +1283,13 @@ impl Widget for FileBrowser {
             _ => {
                 let main_widget_result = self.main_widget_mut()?.on_key(key);
                 if let Err(HError::WidgetUndefinedKeyError{..}) = main_widget_result {
-                    self.preview_widget_mut()?.on_key(key)?;
+                    match self.preview_widget_mut()?.on_key(key) {
+                        Ok(()) => {}
+                        Err(HError::WidgetUndefinedKeyError{key}) => {
+                            self.bad(Event::Key(key))?;
+                        }
+                        err @ Err(_)  => { err?; }
+                    }
                 }
             },
         }
diff --git a/src/listview.rs b/src/listview.rs
index 4c637b9..6a1326c 100644
--- a/src/listview.rs
+++ b/src/listview.rs
@@ -1,4 +1,4 @@
-use termion::event::{Event, Key};
+use termion::event::Key;
 use unicode_width::UnicodeWidthStr;
 
 use std::path::{Path, PathBuf};
@@ -90,7 +90,7 @@ impl Listable for ListView<Files> {
             Key::Char('N') => self.select_next_mtime(),
             Key::Char('n') => self.select_prev_mtime(),
             Key::Char('d') => self.toggle_dirs_first(),
-            _ => { self.bad(Event::Key(key))?; }
+            _ => { HError::undefined_key(key)? }
         }
         Ok(())
     }
diff --git a/src/mediaview.rs b/src/mediaview.rs
index ee84d69..4600dd4 100644
--- a/src/mediaview.rs
+++ b/src/mediaview.rs
@@ -1,5 +1,5 @@
 use lazy_static;
-use termion::event::{Event, Key};
+use termion::event::Key;
 
 use crate::widget::{Widget, WidgetCore};
 use crate::async_value::Stale;
@@ -427,7 +427,7 @@ impl Widget for MediaView {
             Key::Alt('<') => self.seek_backward(),
             Key::Alt('m') => self.toggle_pause(),
             Key::Alt('M') => Ok(self.toggle_mute()),
-            _ => self.bad(Event::Key(key))
+            _ => HError::undefined_key(key)
         }
     }
 }