Fix ToggleActions from releasing other action's inputs (#410)

* Fix `ToggleActions` from releasing other action's inputs * cargo fmt * Update RELEASES.md
Leafwing-Studios · Nov 8, 2023 · 42b0b21 · 42b0b21
1 parent 4091c27
commit 42b0b21
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/RELEASES.md b/RELEASES.md
@@ -1,5 +1,10 @@
 # Release Notes
 
+## Unreleased
+
+### Bugs
+- A disabled `ToggleActions` of one `Action` now does not release other `Action`'s inputs.
+
 ## Version 0.11.1
 - `bevy_egui` integration and the `egui` feature flag have been added back with the release of `bevy_egui` 0.23.
 

diff --git a/src/plugin.rs b/src/plugin.rs
@@ -102,16 +102,13 @@ impl<A: Actionlike> Plugin for InputManagerPlugin<A> {
 
                 app.add_systems(
                     PreUpdate,
-                    update_action_state::<A>.in_set(InputManagerSystem::Update),
-                );
-
-                app.configure_sets(
-                    PreUpdate,
-                    InputManagerSystem::Update
+                    update_action_state::<A>
                         .run_if(run_if_enabled::<A>)
-                        .after(InputSystem),
+                        .in_set(InputManagerSystem::Update),
                 );
 
+                app.configure_sets(PreUpdate, InputManagerSystem::Update.after(InputSystem));
+
                 #[cfg(feature = "egui")]
                 app.configure_sets(
                     PreUpdate,
@@ -125,7 +122,6 @@ impl<A: Actionlike> Plugin for InputManagerPlugin<A> {
                 app.configure_sets(
                     PreUpdate,
                     InputManagerSystem::ManualControl
-                        .run_if(run_if_enabled::<A>)
                         .before(InputManagerSystem::ReleaseOnDisable)
                         .after(InputManagerSystem::Tick)
                         // Must run after the system is updated from inputs, or it will be forcibly released due to the inputs
@@ -139,6 +135,7 @@ impl<A: Actionlike> Plugin for InputManagerPlugin<A> {
                 app.add_systems(
                     PreUpdate,
                     update_action_state_from_interaction::<A>
+                        .run_if(run_if_enabled::<A>)
                         .in_set(InputManagerSystem::ManualControl),
                 );
             }