Remove observer for current notification on errors (#1500)

ianyh · May 28, 2023 · e56ac85 · e56ac85
1 parent ae835c4
commit e56ac85
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/Amethyst/Model/ApplicationObservation.swift b/Amethyst/Model/ApplicationObservation.swift
@@ -178,15 +178,18 @@ struct ApplicationObservation<Delegate: ApplicationObservationDelegate> {
 
         return Observable.from(notifications)
             .scan([]) { observed, notification -> [Notification] in
+                let notifications = observed + [notification]
+
                 do {
                     try self.addObserver(for: notification)
                 } catch {
-                    log.error("Failed to add observer \(notification) on application \(self.application.title() ?? "<unknown>") (\(self.application.pid())): \(error)")
-                    self.removeObservers(notifications: observed)
+                    let applicationTitle = self.application.title() ?? "<unknown>"
+                    log.error("Failed to add observer \(notification) on application \(applicationTitle) (\(self.application.pid())): \(error)")
+                    self.removeObservers(notifications: notifications)
                     throw error
                 }
 
-                return observed + [notification]
+                return notifications
             }
             .map { _ in }
     }