Fix get None

Leafwing-Studios · Jan 30, 2024 · 34ccc19 · 34ccc19
1 parent be4ec97
commit 34ccc19
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/input_map.rs b/src/input_map.rs
@@ -326,9 +326,10 @@ impl<A: Actionlike> InputMap<A> {
             let mut action_datum = ActionData::default();
 
             for input in input_vec {
-                action_datum.axis_pair = input_streams.input_axis_pair(input).map(|new_data| {
-                    new_data.merged_with(action_datum.axis_pair.unwrap_or_default())
-                });
+                if let Some(new_data) = input_streams.input_axis_pair(input) {
+                    let current_data = action_datum.axis_pair.unwrap_or_default();
+                    action_datum.axis_pair = Some(new_data.merged_with(current_data));
+                }
 
                 if input_streams.input_pressed(input) {
                     action_datum.state = ButtonState::JustPressed;