fix: switcher would not close, or cycle on its own (closes #3117)

lwouis · Nov 8, 2024 · d430f83 · d430f83
1 parent c0f0ce7
commit d430f83
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/src/logic/ATShortcut.swift b/src/logic/ATShortcut.swift
@@ -61,7 +61,6 @@ class ATShortcut {
     func shouldTrigger() -> Bool {
         if scope == .global {
             if triggerPhase == .down && (!App.app.appIsBeingUsed || index == nil || index == App.app.shortcutIndex) {
-                App.app.appIsBeingUsed = true
                 return true
             }
             if triggerPhase == .up && App.app.appIsBeingUsed && (index == nil || index == App.app.shortcutIndex) && Preferences.shortcutStyle[App.app.shortcutIndex] == .focusOnRelease {

diff --git a/src/ui/App.swift b/src/ui/App.swift
@@ -206,7 +206,6 @@ class App: AppCenterApplication, NSApplicationDelegate {
     }
 
     @objc func showUi() {
-        appIsBeingUsed = true
         showUiOrCycleSelection(0)
     }
 
@@ -271,6 +270,7 @@ class App: AppCenterApplication, NSApplicationDelegate {
 
     func showUiOrCycleSelection(_ shortcutIndex: Int) {
         logger.i("showUiOrCycleSelection")
+        App.app.appIsBeingUsed = true
         if isFirstSummon || shortcutIndex != self.shortcutIndex {
             logger.i("showUiOrCycleSelection: isFirstSummon")
             isFirstSummon = false