staticプロパティをインスタンスプロパティに変更

[kcd/KCD.git] / KCD / UpgradableShipsWindowController.swift

diff --git a/KCD/UpgradableShipsWindowController.swift b/KCD/UpgradableShipsWindowController.swift
index b306f92..e721e6c 100644 (file)
--- a/KCD/UpgradableShipsWindowController.swift
+++ b/KCD/UpgradableShipsWindowController.swift
@@ -62,9 +62,9 @@ final class UpgradableShipsWindowController: NSWindowController {
         }
         
         if showsExcludedShipInUpgradableList == false,
-            excludeShiIDs.count != 0 {
+            excludeShiIDsCache.count != 0 {
             
-            excludeShip = .not(NSPredicate(#keyPath(Ship.id), valuesIn: excludeShiIDs))
+            excludeShip = .not(NSPredicate(#keyPath(Ship.id), valuesIn: excludeShiIDsCache))
         }
         
         switch (levelOnePredicate, excludeShip) {
@@ -105,12 +105,12 @@ final class UpgradableShipsWindowController: NSWindowController {
     
     private var excludeShipIDsSaveURL: URL {
         
-        return ApplicationDirecrories.support.appendingPathComponent("ExcludeShipIDs")
+        return ApplicationDirecrories.shared.support.appendingPathComponent("ExcludeShipIDs")
     }
     
-    override func windowDidLoad() {
+    override func windowWillLoad() {
         
-        super.windowDidLoad()
+        super.windowWillLoad()
         
         excludeShiIDsCache = excludeShiIDs
     }