fix ctrl-left not removing filtering in preview

Canop · Oct 13, 2022 · 9f33871 · 9f33871
1 parent 6eba751
commit 9f33871
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### v1.16.1 - 2022-10-13
+<a name="v1.16.1"></a>
+- fix ctrl-left not usable anymore in filtered preview to remove filtering
+
 ### v1.16.0 - 2022-10-07
 <a name="v1.16.0"></a>
 - status messages now displayed on toggling (for example showing hidden files)

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "broot"
-version = "1.16.0"
+version = "1.16.1"
 authors = ["dystroy <denys.seguret@gmail.com>"]
 repository = "https://github.com/Canop/broot"
 homepage = "https://dystroy.org/broot"

diff --git a/src/preview/preview_state.rs b/src/preview/preview_state.rs
@@ -374,11 +374,16 @@ impl PanelState for PreviewState {
                 self.pending_pattern = self.removed_pattern.take();
                 Ok(CmdResult::Keep)
             }
-            Internal::panel_left_no_open => Ok(CmdResult::HandleInApp(Internal::panel_left_no_open)),
+            Internal::panel_left_no_open if self.removed_pattern.is_some() => {
+                self.pending_pattern = self.removed_pattern.take();
+                Ok(CmdResult::Keep)
+            }
             Internal::panel_right if self.filtered_preview.is_some() => {
                 self.on_pattern(InputPattern::none(), app_state, con)
             }
-            Internal::panel_right_no_open => Ok(CmdResult::HandleInApp(Internal::panel_right_no_open)),
+            Internal::panel_right_no_open if self.filtered_preview.is_some() => {
+                self.on_pattern(InputPattern::none(), app_state, con)
+            }
             Internal::select_first => {
                 self.mut_preview().select_first();
                 Ok(CmdResult::Keep)