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

Make InputFocus optional in bevy_winit (#17358)

Browse Source 
# Objective

- Stop bevy from crashing when losing window focus

## Solution

- The InputFocus resource is optional but is accessed unconditionally in
bevy_winit. Make it optional.

## Testing

- Ran the window_settings example

## Note

It's possible this might not be a full fix for the issue, but this stop
bevy from crashing.

Closes #16961 
Closes #17227
This commit is contained in:
IceSentry 2025-01-14 00:08:20 -05:00 committed by GitHub
parent 0222b35f6d
commit 41fd280596
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crates/bevy_winit/src/accessibility.rs
View File

@ -181,7 +181,7 @@ fn should_update_accessibility_nodes(
fn update_accessibility_nodes( fn update_accessibility_nodes(
mut adapters: NonSendMut<AccessKitAdapters>, mut adapters: NonSendMut<AccessKitAdapters>,
focus: Res<InputFocus>, focus: Option<Res<InputFocus>>,
primary_window: Query<(Entity, &Window), With<PrimaryWindow>>, primary_window: Query<(Entity, &Window), With<PrimaryWindow>>,
nodes: Query<( nodes: Query<(
Entity, Entity,
@ -197,6 +197,9 @@ fn update_accessibility_nodes(
let Some(adapter) = adapters.get_mut(&primary_window_id) else { let Some(adapter) = adapters.get_mut(&primary_window_id) else {
return; return;
}; };
let Some(focus) = focus else {
return;
};
if focus.is_changed() || !nodes.is_empty() { if focus.is_changed() || !nodes.is_empty() {
// Don't panic if the focused entity does not currently exist // Don't panic if the focused entity does not currently exist
// It's probably waiting to be spawned // It's probably waiting to be spawned