On 17/3/22 16:29, Akihiko Odaki wrote:
Signed-off-by: Akihiko Odaki <akihiko.od...@gmail.com>
---
ui/cocoa.m | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/ui/cocoa.m b/ui/cocoa.m
index cb6e7c41dc6..c4e5468f9e6 100644
--- a/ui/cocoa.m
+++ b/ui/cocoa.m
@@ -923,7 +923,8 @@ - (bool) handleEventLocked:(NSEvent *)event
/* Don't pass command key changes to guest unless mouse is
grabbed */
case kVK_Command:
if (isMouseGrabbed &&
- !!(modifiers & NSEventModifierFlagCommand)) {
+ !!(modifiers & NSEventModifierFlagCommand) &&
+ left_command_key_enabled) {
My bad for trying to resolve merge conflict myself sigh :(
Fixes: 4797adce5f ("ui/cocoa: add option to swap Option and Command")
Reviewed-by: Philippe Mathieu-Daudé <f4...@amsat.org>
if (swap_opt_cmd) {
[self toggleKey:Q_KEY_CODE_ALT];
} else {
