From 38a2f7e487f6b2cd6ea5962ed3386e7caa3887a4 Mon Sep 17 00:00:00 2001 From: ShikiSuen Date: Tue, 15 Mar 2022 21:09:10 +0800 Subject: [PATCH] ctlPrefWindow // Format tweaks & remove useless expressions. --- Source/WindowControllers/ctlPrefWindow.swift | 38 ++++++++++---------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/Source/WindowControllers/ctlPrefWindow.swift b/Source/WindowControllers/ctlPrefWindow.swift index 689839d4..89dc2eb7 100644 --- a/Source/WindowControllers/ctlPrefWindow.swift +++ b/Source/WindowControllers/ctlPrefWindow.swift @@ -211,27 +211,25 @@ extension RangeReplaceableCollection where Element: Hashable { @IBAction func changeSelectionKeyAction(_ sender: Any) { guard let keys = (sender as AnyObject).stringValue?.trimmingCharacters(in: .whitespacesAndNewlines).charDeDuplicate else { - return + return + } + do { + try Preferences.validate(candidateKeys: keys) + Preferences.candidateKeys = keys + selectionKeyComboBox.stringValue = Preferences.candidateKeys + } + catch Preferences.CandidateKeyError.empty { + selectionKeyComboBox.stringValue = Preferences.candidateKeys + } + catch { + if let window = window { + let alert = NSAlert(error: error) + alert.beginSheetModal(for: window) { response in + self.selectionKeyComboBox.stringValue = Preferences.candidateKeys } - do { - try Preferences.validate(candidateKeys: keys) - Preferences.candidateKeys = keys - } - catch Preferences.CandidateKeyError.empty { - selectionKeyComboBox.stringValue = Preferences.candidateKeys - } - catch { - if let window = window { - let alert = NSAlert(error: error) - alert.beginSheetModal(for: window) { response in - self.selectionKeyComboBox.stringValue = Preferences.candidateKeys - } - clsSFX.beep() - } - } - - selectionKeyComboBox.stringValue = keys - Preferences.candidateKeys = keys + clsSFX.beep() + } + } } }