refactor: single instance subscription

pop-os · Mar 2, 2024 · d9228d7 · d9228d7
1 parent be0742f
commit d9228d7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/iced b/iced
diff --git a/src/app/cosmic.rs b/src/app/cosmic.rs
@@ -210,12 +210,6 @@ where
                 })
                 .map(super::Message::Cosmic),
             window_events.map(super::Message::Cosmic),
-            #[cfg(feature = "single-instance")]
-            self.app
-                .core()
-                .single_instance
-                .then(|| super::single_instance_subscription::<T>())
-                .unwrap_or_else(Subscription::none),
             #[cfg(feature = "xdg-portal")]
             crate::theme::portal::desktop_settings()
                 .map(Message::DesktopSettings)
@@ -230,6 +224,11 @@ where
             );
         }
 
+        #[cfg(feature = "single-instance")]
+        if self.app.core().single_instance {
+            subscriptions.push(super::single_instance_subscription::<T>());
+        }
+
         Subscription::batch(subscriptions)
     }