From 3c967fcaf0beeff973d8f18ac7d802b4e8c3e96a Mon Sep 17 00:00:00 2001 From: Aurelien Rouene Date: Tue, 30 Jul 2024 00:32:08 +0200 Subject: [PATCH 1/2] Does not return removed commands --- spotify_player/src/config/keymap.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/spotify_player/src/config/keymap.rs b/spotify_player/src/config/keymap.rs index 9eac25fb..b11a78b1 100644 --- a/spotify_player/src/config/keymap.rs +++ b/spotify_player/src/config/keymap.rs @@ -397,6 +397,7 @@ impl KeymapConfig { self.keymaps .iter() .find(|&keymap| keymap.key_sequence == *key_sequence) + .filter(|keymap| keymap.command != Command::None) .map(|keymap| keymap.command) } From fdb8539da6382fafe6676bb8b6e6182812b83d22 Mon Sep 17 00:00:00 2001 From: Aurelien Rouene Date: Tue, 30 Jul 2024 00:46:56 +0200 Subject: [PATCH 2/2] merge with find condition --- spotify_player/src/config/keymap.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/spotify_player/src/config/keymap.rs b/spotify_player/src/config/keymap.rs index b11a78b1..452a43bf 100644 --- a/spotify_player/src/config/keymap.rs +++ b/spotify_player/src/config/keymap.rs @@ -396,8 +396,7 @@ impl KeymapConfig { pub fn find_command_from_key_sequence(&self, key_sequence: &KeySequence) -> Option { self.keymaps .iter() - .find(|&keymap| keymap.key_sequence == *key_sequence) - .filter(|keymap| keymap.command != Command::None) + .find(|&keymap| keymap.key_sequence == *key_sequence && keymap.command != Command::None) .map(|keymap| keymap.command) }