refactor(data-device): merge both cases in leave

Co-authored-by: Kirill Chibisov <[email protected]>
Smithay · Sep 22, 2023 · d0812fd · d0812fd
1 parent 251321d
commit d0812fd
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/src/data_device_manager/data_offer.rs b/src/data_device_manager/data_offer.rs
@@ -322,14 +322,12 @@ impl DataOfferData {
     pub(crate) fn leave(&self) -> bool {
         let mut inner = self.inner.lock().unwrap();
         match &mut inner.deref_mut().offer {
-            DataDeviceOffer::Drag(o) if o.dropped => {
-                o.left = true;
-                false
-            }
-            DataDeviceOffer::Drag(o) if !o.dropped => {
+            DataDeviceOffer::Drag(o) => {
                 o.left = true;
-                o.data_offer.destroy();
-                true
+                if !o.dropped {
+                    o.data_offer.destroy();
+                }
+                !o.dropped
             }
             _ => {
                 warn!("DataDeviceOffer::leave called on non-drag offer");