Merge pull request #1700 from nicksenger/overlay/fix-panic

Fix panic when overlay event processing removes overlay
iced-rs · Feb 14, 2023 · efbf66b · efbf66b
2 parents 2c680a3 + 41822d0
commit efbf66b
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/native/src/user_interface.rs b/native/src/user_interface.rs
@@ -263,16 +263,16 @@ where
                 }
             }
 
-            let base_cursor = if manual_overlay
+            let base_cursor = manual_overlay
                 .as_ref()
-                .unwrap()
-                .is_over(Layout::new(&layout), cursor_position)
-            {
-                // TODO: Type-safe cursor availability
-                Point::new(-1.0, -1.0)
-            } else {
-                cursor_position
-            };
+                .filter(|overlay| {
+                    overlay.is_over(Layout::new(&layout), cursor_position)
+                })
+                .map(|_| {
+                    // TODO: Type-safe cursor availability
+                    Point::new(-1.0, -1.0)
+                })
+                .unwrap_or(cursor_position);
 
             self.overlay = Some(layout);