forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix hang on missing state update handler (#1051)

Browse Source
This commit is contained in:
sapir 2020-12-13 21:55:32 +02:00 committed by GitHub
parent 9a4327b3e2
commit 002e22fca0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
crates/bevy_ecs/src/schedule/state.rs
View File

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