🔀 Merge pull request #570 from MrKai77/mrkai77/loop-635-command-trigg…

…er-interfering-with-bartender-functionality
MrKai77 · Sep 27, 2024 · 751dc92 · 751dc92
2 parents 5989b92 + 7a35151
commit 751dc92
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/Loop/Managers/LoopManager.swift b/Loop/Managers/LoopManager.swift
@@ -119,14 +119,14 @@ private extension LoopManager {
 
         leftClickMonitor = CGEventMonitor(
             eventMask: [.leftMouseDown],
-            callback: { cgEvent in
-                guard self.isLoopActive else {
+            callback: { [weak self] cgEvent in
+                guard let self, isLoopActive, currentAction.direction != .noAction else {
                     return Unmanaged.passUnretained(cgEvent)
                 }
 
                 if cgEvent.type == .leftMouseDown,
-                   let parentCycleAction = self.parentCycleAction {
-                    self.changeAction(parentCycleAction, disableHapticFeedback: true)
+                   let parentCycleAction {
+                    changeAction(parentCycleAction, disableHapticFeedback: true)
                 }
 
                 return nil