Skip to content

Commit

Permalink
fix order of exit/close window systems (#5558)
Browse files Browse the repository at this point in the history
# Objective

Fixes #5384 and maybe other issues around window closing/app not exiting

## Solution

There are three systems involved in exiting when closing a window:
- `close_when_requested` asking Winit to close the window in stage `Update`
- `exit_on_all_closed` exiting when no window remains opened in stage `Update`
- `change_window` removing windows that are closed in stage `PostUpdate`

This ordering meant that when closing a window, we had to run one more frame to actually exit. As there was no window, panics could occur in systems assuming there was a window. In case of Bevy app using a low power options, that means waiting for the timeout before actually exiting the app (60 seconds by default)

This PR changes the ordering so that `exit_on_all_closed` happens after `change_window` in the same frame, so there isn't an extra frame without window
  • Loading branch information
mockersf authored and cart committed Aug 18, 2022
1 parent 52ccd76 commit 12daeeb
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions crates/bevy_window/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@ pub mod prelude {
}

use bevy_app::prelude::*;
use bevy_ecs::{event::Events, schedule::SystemLabel};
use bevy_ecs::{
event::Events,
schedule::{ParallelSystemDescriptorCoercion, SystemLabel},
};

/// The configuration information for the [`WindowPlugin`].
///
Expand Down Expand Up @@ -106,7 +109,10 @@ impl Plugin for WindowPlugin {
}

if settings.exit_on_all_closed {
app.add_system(exit_on_all_closed);
app.add_system_to_stage(
CoreStage::PostUpdate,
exit_on_all_closed.after(ModifiesWindows),
);
}
if settings.close_when_requested {
app.add_system(close_when_requested);
Expand Down

0 comments on commit 12daeeb

Please sign in to comment.