Skip to content

Fix hang on missing state update handler #1051

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 13, 2020
Merged

Fix hang on missing state update handler #1051

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions crates/bevy_ecs/src/schedule/state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ impl<T: Resource + Clone> Stage for StateStage<T> {
}

fn run(&mut self, world: &mut World, resources: &mut Resources) {
loop {
let current_stage = loop {
let (next_stage, current_stage) = {
let mut state = resources
.get_mut::<State<T>>()
Expand Down Expand Up @@ -132,14 +132,17 @@ impl<T: Resource + Clone> Stage for StateStage<T> {
{
enter_next.run(world, resources);
}
} else if let Some(update_current) = self
.stages
.get_mut(&current_stage)
.and_then(|stage| stage.update.as_mut())
{
update_current.run(world, resources);
break;
} else {
break current_stage;
}
};

if let Some(update_current) = self
.stages
.get_mut(&current_stage)
.and_then(|stage| stage.update.as_mut())
{
update_current.run(world, resources);
}
}
}
Expand Down