#5518: handling panic in copy_and_paste.rs line 105 (#6004)

* #5518: handling panic in copy_and_paste.rs line 105 Co-authored-by: Wez Furlong <[email protected]>
wez · Sep 14, 2024 · 137a97b · 137a97b
1 parent fed0e39
commit 137a97b
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/window/src/os/wayland/copy_and_paste.rs b/window/src/os/wayland/copy_and_paste.rs
@@ -102,12 +102,9 @@ impl CopyAndPaste {
 impl WaylandState {
     pub(super) fn resolve_copy_and_paste(&mut self) -> Option<Arc<Mutex<CopyAndPaste>>> {
         let active_surface_id = self.active_surface_id.borrow();
-        let active_surface_id = active_surface_id.as_ref().unwrap();
-        if let Some(pending) = self.surface_to_pending.get(&active_surface_id) {
-            Some(Arc::clone(&pending.lock().unwrap().copy_and_paste))
-        } else {
-            None
-        }
+        let active_surface_id = active_surface_id.as_ref()?;
+        let pending = self.surface_to_pending.get(&active_surface_id)?;
+        Some(Arc::clone(&pending.lock().unwrap().copy_and_paste))
     }
 }