Merge pull request #207 from mtgto/disabled-dict

無効にした辞書の説明に XXエントリと表示され続けていたのを修正
mtgto · Aug 25, 2024 · 6b1d7ee · 6b1d7ee
2 parents 4df58b2 + 4316fb4
commit 6b1d7ee
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/macSKK/Settings/DictionariesView.swift b/macSKK/Settings/DictionariesView.swift
@@ -99,11 +99,10 @@ struct DictionariesView: View {
     }
 
     private func loadingStatus(setting: DictSetting) -> String {
-        if let status = settingsViewModel.dictLoadingStatuses[setting.id] {
-            return loadingStatus(of: status)
-        } else if !setting.enabled {
-            // 元々無効になっていて、設定を今回の起動で切り替えてない辞書
+        if !setting.enabled {
             return String(localized: "LoadingStatusDisabled")
+        } else if let status = settingsViewModel.dictLoadingStatuses[setting.id] {
+            return loadingStatus(of: status)
         } else {
             return String(localized: "LoadingStatusUnknown")
         }