Fix copy and paste

wez · May 17, 2024 · d106504 · d106504
1 parent e0ebd9d
commit d106504
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/window/src/os/wayland/copy_and_paste.rs b/window/src/os/wayland/copy_and_paste.rs
@@ -102,9 +102,12 @@ 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))
+        if let Some(active_surface_id) = active_surface_id.as_ref() {
+            if let Some(pending) = self.surface_to_pending.get(&active_surface_id) {
+                Some(Arc::clone(&pending.lock().unwrap().copy_and_paste))
+            } else {
+                None
+            }
         } else {
             None
         }