From 35cc98f9cf4cf271ac858de935340a58b55eea9e Mon Sep 17 00:00:00 2001 From: ShikiSuen Date: Sun, 16 Jan 2022 14:14:10 +0800 Subject: [PATCH] Shiki: Fixing how to handle the default candidate keys Update PreferencesWindowController.swift --- Source/PreferencesWindowController.swift | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Source/PreferencesWindowController.swift b/Source/PreferencesWindowController.swift index 5e7b3fe3..c276871f 100644 --- a/Source/PreferencesWindowController.swift +++ b/Source/PreferencesWindowController.swift @@ -155,17 +155,13 @@ extension RangeReplaceableCollection where Element: Hashable { let keys = (sender as AnyObject).stringValue.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines).charDeDuplicate if keys.count != 9 || !keys.canBeConverted(to: .ascii) { selectionKeyComboBox.stringValue = Preferences.defaultKeys - Preferences.candidateKeys = nil + Preferences.candidateKeys = Preferences.defaultKeys // 修正記錄:這裡千萬不能是 nil,否則會鬼打牆。 NSSound.beep() return } selectionKeyComboBox.stringValue = keys - if keys == Preferences.defaultKeys { - Preferences.candidateKeys = nil - } else { - Preferences.candidateKeys = keys - } + Preferences.candidateKeys = keys } }