Skip to content

Tolerate absent mod1 and mod2 #1771

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 21, 2025
Merged

Tolerate absent mod1 and mod2 #1771

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions Amethyst/Preferences/UserConfiguration.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
case windowMinimumWidth = "window-minimum-width"
case windowMaxCount = "window-max-count"
case floatingBundleIdentifiers = "floating"
case floatingBundleIdentifiersIsBlacklist = "floating-is-blacklist"

Check warning on line 79 in Amethyst/Preferences/UserConfiguration.swift

View workflow job for this annotation

GitHub Actions / Build and run unit tests 

Inclusive Language Violation: Declaration floatingBundleIdentifiersIsBlacklist contains the term "blacklist" which is not considered inclusive (inclusive_language)
case ignoreMenuBar = "ignore-menu-bar"
case floatSmallWindows = "float-small-windows"
case mouseFollowsFocus = "mouse-follows-focus"
Expand Down Expand Up @@ -389,14 +389,32 @@
alert.runModal()
}

let mod1Strings: [String] = configurationValueForKey(.mod1)!
let mod2Strings: [String] = configurationValueForKey(.mod2)!
let mod1Strings: [String] = configurationValueForKey(.mod1) ?? []
let mod2Strings: [String] = configurationValueForKey(.mod2) ?? []
let mod3Strings: [String]? = configurationValueForKey(.mod3)
let mod4Strings: [String]? = configurationValueForKey(.mod4)

modifier1 = modifierFlagsForStrings(mod1Strings)
modifier2 = modifierFlagsForStrings(mod2Strings)

if modifier1 == nil || modifier1!.isEmpty {
log.error("error loading a mod1")

let alert = NSAlert()
alert.alertStyle = .critical
alert.messageText = "Error loading mod1"
alert.runModal()
}

if modifier2 == nil || modifier2!.isEmpty {
log.error("error loading a mod2")

let alert = NSAlert()
alert.alertStyle = .critical
alert.messageText = "Error loading mod2"
alert.runModal()
}

if let mod3Strings = mod3Strings {
modifier3 = modifierFlagsForStrings(mod3Strings)
}
Expand Down
Loading