fix: stop vim keys preference disabling on launch (closes #2919)

lwouis · Oct 24, 2023 · 53692ff · 53692ff
1 parent 3b0194d
commit 53692ff
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/ui/preferences-window/tabs/ControlsTab.swift b/src/ui/preferences-window/tabs/ControlsTab.swift
@@ -235,7 +235,7 @@ class ControlsTab {
             "j": "vimCycleDown"
         ]
         if (sender as! NSButton).state == .on {
-            if App.app.preferencesWindow != nil && isClearVimKeysSuccessful() {
+            if isClearVimKeysSuccessful() {
                 keyActions.forEach { addShortcut(.down, .local, Shortcut(keyEquivalent: $0)!, $1, nil) }
             } else {
                 (sender as! NSButton).state = .off
@@ -257,7 +257,9 @@ class ControlsTab {
             }
         }
         if !conflicts.isEmpty {
-            if !shouldClearConflictingShortcuts(conflicts.map { $0.value }) {
+            // if the app is still launching (App.app.preferencesWindow == nil) and we have a conflict
+            // then we don't show the user a dialog, and simply disable vim keys
+            if App.app.preferencesWindow == nil || !shouldClearConflictingShortcuts(conflicts.map { $0.value }) {
                 return false
             }
             conflicts.forEach {