replace all .single calls with matched .get_single calls (#296)

* replace all .single calls with matched .get_single calls * Update changelog --------- Co-authored-by: Aevyrie <[email protected]>
aevyrie · Feb 24, 2024 · fd08e46 · fd08e46
1 parent f1a64e2
commit fd08e46
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # UNRELEASED
 
+- Fixed: replace all `.single` calls with matched `.get_single` calls to avoid crashing in
+  environments where there is no window available
 - Fixed: sprite picking depth is now consistent with other picking backends.
 - Fixed: entities with identical depth could be dropped due to the use of a BTreeMap to sort
   entities by depth. This has been changed to use a sorted Vec, to allow entities with the same

diff --git a/backends/bevy_picking_sprite/src/lib.rs b/backends/bevy_picking_sprite/src/lib.rs
@@ -69,7 +69,10 @@ pub fn sprite_picking(
             .find(|(_, camera, _, _)| {
                 camera
                     .target
-                    .normalize(Some(primary_window.single()))
+                    .normalize(Some(match primary_window.get_single() {
+                        Ok(w) => w,
+                        Err(_) => return false,
+                    }))
                     .unwrap()
                     == location.target
             })

diff --git a/backends/bevy_picking_ui/src/lib.rs b/backends/bevy_picking_ui/src/lib.rs
@@ -96,7 +96,10 @@ pub fn ui_picking(
                 )
             })
     }) {
-        let window_entity = primary_window.single();
+        let window_entity = match primary_window.get_single() {
+            Ok(w) => w,
+            Err(_) => continue,
+        };
 
         // Find the topmost bevy_ui camera with the same target as this pointer.
         //

diff --git a/crates/bevy_picking_core/src/pointer.rs b/crates/bevy_picking_core/src/pointer.rs
@@ -296,7 +296,10 @@ impl Location {
     ) -> bool {
         if camera
             .target
-            .normalize(Some(primary_window.single()))
+            .normalize(Some(match primary_window.get_single() {
+                Ok(w) => w,
+                Err(_) => return false,
+            }))
             .as_ref()
             != Some(&self.target)
         {

diff --git a/crates/bevy_picking_input/src/mouse.rs b/crates/bevy_picking_input/src/mouse.rs
@@ -36,7 +36,13 @@ pub fn mouse_pick_events(
             PointerId::Mouse,
             Location {
                 target: RenderTarget::Window(WindowRef::Entity(event.window))
-                    .normalize(Some(windows.single().0))
+                    .normalize(Some(
+                        match windows.get_single() {
+                            Ok(w) => w,
+                            Err(_) => continue,
+                        }
+                        .0,
+                    ))
                     .unwrap(),
                 position: event.position,
             },

diff --git a/crates/bevy_picking_input/src/touch.rs b/crates/bevy_picking_input/src/touch.rs
@@ -37,7 +37,13 @@ pub fn touch_pick_events(
         let pointer = PointerId::Touch(touch.id);
         let location = Location {
             target: RenderTarget::Window(WindowRef::Primary)
-                .normalize(Some(windows.single().0))
+                .normalize(Some(
+                    match windows.get_single() {
+                        Ok(w) => w,
+                        Err(_) => continue,
+                    }
+                    .0,
+                ))
                 .unwrap(),
             position: touch.position,
         };