Skip to content

Commit 68261aa

Browse files
authored
Tolerate absent mod1 and mod2 (#1771)
1 parent 66c1ee3 commit 68261aa

File tree

1 file changed

+20
-2
lines changed

1 file changed

+20
-2
lines changed

Amethyst/Preferences/UserConfiguration.swift

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -389,14 +389,32 @@ class UserConfiguration: NSObject {
389389
alert.runModal()
390390
}
391391

392-
let mod1Strings: [String] = configurationValueForKey(.mod1)!
393-
let mod2Strings: [String] = configurationValueForKey(.mod2)!
392+
let mod1Strings: [String] = configurationValueForKey(.mod1) ?? []
393+
let mod2Strings: [String] = configurationValueForKey(.mod2) ?? []
394394
let mod3Strings: [String]? = configurationValueForKey(.mod3)
395395
let mod4Strings: [String]? = configurationValueForKey(.mod4)
396396

397397
modifier1 = modifierFlagsForStrings(mod1Strings)
398398
modifier2 = modifierFlagsForStrings(mod2Strings)
399399

400+
if modifier1 == nil || modifier1!.isEmpty {
401+
log.error("error loading a mod1")
402+
403+
let alert = NSAlert()
404+
alert.alertStyle = .critical
405+
alert.messageText = "Error loading mod1"
406+
alert.runModal()
407+
}
408+
409+
if modifier2 == nil || modifier2!.isEmpty {
410+
log.error("error loading a mod2")
411+
412+
let alert = NSAlert()
413+
alert.alertStyle = .critical
414+
alert.messageText = "Error loading mod2"
415+
alert.runModal()
416+
}
417+
400418
if let mod3Strings = mod3Strings {
401419
modifier3 = modifierFlagsForStrings(mod3Strings)
402420
}

0 commit comments

Comments
 (0)