Receive several publishers on main queue

jordanbaird · Sep 28, 2024 · 19087a2 · 19087a2
1 parent 8f003e6
commit 19087a2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/Ice/Main/AppState.swift b/Ice/Main/AppState.swift
@@ -93,6 +93,7 @@ final class AppState: ObservableObject {
                 .delay(for: 0.1, scheduler: DispatchQueue.main)
                 .mapToVoid()
         )
+        .receive(on: DispatchQueue.main)
         .sink { [weak self] _ in
             guard let self else {
                 return

diff --git a/Ice/MenuBar/MenuBarManager.swift b/Ice/MenuBar/MenuBarManager.swift
@@ -96,6 +96,7 @@ final class MenuBarManager: ObservableObject {
         var c = Set<AnyCancellable>()
 
         NSApp.publisher(for: \.currentSystemPresentationOptions)
+            .receive(on: DispatchQueue.main)
             .sink { [weak self] options in
                 guard let self else {
                     return
@@ -112,6 +113,7 @@ final class MenuBarManager: ObservableObject {
             window.publisher(for: \.frame)
                 .map { $0.origin.y }
                 .removeDuplicates()
+                .receive(on: DispatchQueue.main)
                 .sink { [weak self] _ in
                     guard
                         let self,
@@ -126,6 +128,7 @@ final class MenuBarManager: ObservableObject {
 
         // Handle the `focusedApp` rehide strategy.
         NSWorkspace.shared.publisher(for: \.frontmostApplication)
+            .receive(on: DispatchQueue.main)
             .sink { [weak self] _ in
                 if
                     let self,
@@ -150,6 +153,7 @@ final class MenuBarManager: ObservableObject {
                 settingsWindow.publisher(for: \.isVisible),
                 iceBarPanel.publisher(for: \.isVisible)
             )
+            .receive(on: DispatchQueue.main)
             .sink { [weak self] settingsIsVisible, iceBarIsVisible in
                 guard let self else {
                     return