From 87ab8179e1bd9880239c340855ae8862034bd0e8 Mon Sep 17 00:00:00 2001
From: Ashley Wulber <ashley@system76.com>
Date: Tue, 15 Sep 2026 18:56:15 -0400
Subject: [PATCH] chain tasks where not already done

---
 src/app/cosmic.rs | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/app/cosmic.rs b/src/app/cosmic.rs
index 0b31606d..c2521b3f 100644
--- a/src/app/cosmic.rs
+++ b/src/app/cosmic.rs
@@ -1673,7 +1673,7 @@ impl<App: Application> Cosmic<App> {
                 view,
             ),
         );
-        Task::batch([live_settings_task, get_subsurface(settings)])
+        live_settings_task.chain(get_subsurface(settings))
     }
 
     #[cfg(wayland_platform)]
@@ -1729,16 +1729,13 @@ impl<App: Application> Cosmic<App> {
                 view,
             ),
         );
-        Task::batch([
-            iced_runtime::task::oneshot(|channel| {
-                iced_runtime::Action::Window(iced_runtime::window::Action::Open(
-                    id, settings, channel,
-                ))
-            })
-            .discard(),
-            // We don't control window creation in the same way
-            live_settings_task,
-        ])
+
+        // We don't control window creation in the same way
+        iced_runtime::task::oneshot(|channel| {
+            iced_runtime::Action::Window(iced_runtime::window::Action::Open(id, settings, channel))
+        })
+        .discard()
+        .chain(live_settings_task)
     }
 
     #[cfg(wayland_platform)]
@@ -1766,7 +1763,7 @@ impl<App: Application> Cosmic<App> {
                 view,
             ),
         );
-        Task::batch([live_settings_task, get_layer_surface(settings)])
+        live_settings_task.chain(get_layer_surface(settings))
     }
 
     #[cfg(wayland_platform)]