fix: keybindings disappear when mixing presets with a wrong filter co…

…ndition (#1568)
sxyazi · Aug 29, 2024 · b280d79 · b280d79
1 parent ddb8ce5
commit b280d79
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/yazi-config/src/keymap/keymap.rs b/yazi-config/src/keymap/keymap.rs
@@ -67,10 +67,10 @@ impl<'de> Deserialize<'de> for Keymap {
 
 		fn mix(mut a: IndexSet<Chord>, b: IndexSet<Chord>, c: IndexSet<Chord>) -> Vec<Chord> {
 			let mut seen = HashSet::new();
-			b.iter().filter_map(|v| v.on.get(1)).for_each(|&k| _ = seen.insert(k));
-			c.iter().filter_map(|v| v.on.get(1)).for_each(|&k| _ = seen.insert(k));
+			b.iter().filter(|&v| v.on.len() > 1).for_each(|v| _ = seen.insert(&v.on[..2]));
+			c.iter().filter(|&v| v.on.len() > 1).for_each(|v| _ = seen.insert(&v.on[..2]));
 
-			a.retain(|v| v.on.len() < 2 || !seen.contains(&v.on[1]));
+			a.retain(|v| v.on.len() < 2 || !seen.contains(&v.on[..2]));
 			Preset::mix(a, b, c).collect()
 		}