addObserverOnceを利用するようにした

diff --git a/KCD/FleetManager.swift b/KCD/FleetManager.swift
index bd01c19..a9ec66d 100644 (file)
--- a/KCD/FleetManager.swift
+++ b/KCD/FleetManager.swift
@@ -48,13 +48,11 @@ final class FleetManager: NSObject {
         
         if fleets[0].ships.isEmpty {
             
-            let center = NotificationCenter.default
-            weak var token: NSObjectProtocol!
-            token = center.addObserver(forName: .PortAPIReceived, object: nil, queue: nil) {_ in
-                
-                center.removeObserver(token)
-                DispatchQueue.main.async(execute: self.setupFleetController)
-                DispatchQueue.main.async(execute: self.setNewFleetNumberToShip)
+            NotificationCenter.default
+                .addObserverOnce(forName: .PortAPIReceived, object: nil, queue: nil) { _ in
+                    
+                    DispatchQueue.main.async(execute: self.setupFleetController)
+                    DispatchQueue.main.async(execute: self.setNewFleetNumberToShip)
             }
             
         } else {

diff --git a/KCD/FleetViewController.swift b/KCD/FleetViewController.swift
index e9ce267..3b06ccc 100644 (file)
--- a/KCD/FleetViewController.swift
+++ b/KCD/FleetViewController.swift
@@ -255,11 +255,9 @@ final class FleetViewController: NSViewController {
         fleetNumber = 1
         
         // 初回起動時などデータがまだない時はportAPIを受信後設定する
-        weak var token: NSObjectProtocol?
-        token = NotificationCenter.default
-            .addObserver(forName: .PortAPIReceived, object: nil, queue: nil) { [weak self] _ in
+        NotificationCenter.default
+            .addObserverOnce(forName: .PortAPIReceived, object: nil, queue: nil) { [weak self] _ in
                 
-                token.map(NotificationCenter.default.removeObserver)
                 self?.fleetNumber = 1
         }
         

diff --git a/KCD/WindowManager.swift b/KCD/WindowManager.swift
index e3057a0..c2e5ddf 100644 (file)
--- a/KCD/WindowManager.swift
+++ b/KCD/WindowManager.swift
@@ -122,12 +122,9 @@ final class WindowManager {
         browserWindowControllers.append(browser)
         browser.window?.makeKeyAndOrderFront(nil)
         
-        weak var token: NSObjectProtocol! = nil
-        
-        token = NotificationCenter.default
-            .addObserver(forName: NSWindow.willCloseNotification, object: browser.window, queue: nil) { [unowned self] notification in
+        NotificationCenter.default
+            .addObserverOnce(forName: NSWindow.willCloseNotification, object: browser.window, queue: nil) { [unowned self] notification in
                 
-                NotificationCenter.default.removeObserver(token)
                 if let obj = notification.object as? NSWindow,
                     let index = self.browserWindowControllers.index(where: { $0.window == obj }) {