循環参照の危険性を排除

diff --git a/KCD/NotificationCenterExtension.swift b/KCD/NotificationCenterExtension.swift
index b5bdf07..1e1129d 100644 (file)
--- a/KCD/NotificationCenterExtension.swift
+++ b/KCD/NotificationCenterExtension.swift
@@ -13,10 +13,10 @@ extension NotificationCenter {
     func addObserverOnce(forName name: NSNotification.Name?, object obj: Any?, queue: OperationQueue?, using block: @escaping (Notification) -> Void) {
         
         weak var token: NSObjectProtocol?
-        token = addObserver(forName: name, object: obj, queue: queue) {
+        token = addObserver(forName: name, object: obj, queue: queue) { [weak self] notification in
             
-            token.map(self.removeObserver)
-            block($0)
+            self.map { me in token.map(me.removeObserver) }
+            block(notification)
         }
     }
 }