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

Fix panic when overlay event processing removes overlay

native/src/user_interface.rs

@@ -263,16 +263,16 @@ where
                 }
             }
 
-            let base_cursor = if manual_overlay
+            let base_cursor = manual_overlay
                 .as_ref()
-                .unwrap()
+                .filter(|overlay| {
-                .is_over(Layout::new(&layout), cursor_position)
+                    overlay.is_over(Layout::new(&layout), cursor_position)
-            {
+                })
-                // TODO: Type-safe cursor availability
+                .map(|_| {
-                Point::new(-1.0, -1.0)
+                    // TODO: Type-safe cursor availability
-            } else {
+                    Point::new(-1.0, -1.0)
-                cursor_position
+                })
-            };
+                .unwrap_or(cursor_position);
 
             self.overlay = Some(layout);