Skip to content

Allow DiagnosticsBuffer to be applied even if DiagnosticsStore is missing. #21550

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
Oct 23, 2025
Merged

Allow DiagnosticsBuffer to be applied even if DiagnosticsStore is missing. #21550

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
12 changes: 11 additions & 1 deletion crates/bevy_diagnostic/src/diagnostic.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,17 @@ impl SystemBuffer for DiagnosticsBuffer {
_system_meta: &bevy_ecs::system::SystemMeta,
world: &mut bevy_ecs::world::World,
) {
let mut diagnostics = world.resource_mut::<DiagnosticsStore>();
let Some(mut diagnostics) = world.get_resource_mut::<DiagnosticsStore>() else {
// `SystemBuffer::apply` is called even if the system never runs. If a user uses
// `If<Diagnostics>`, this buffer will be applied even if we are missing
// `DiagnosticsStore`. So be permissive to allow these cases. See
// https://github.com/bevyengine/bevy/issues/21549 for more.

// Clear the buffer since we have nowhere to put those metrics and we don't want them to
// grow without bound.
self.0.clear();
return;
};
for (path, measurement) in self.0.drain() {
if let Some(diagnostic) = diagnostics.get_mut(&path) {
diagnostic.add_measurement(measurement);
Expand Down