From 7d344004d0cd8ca741a58c285abacbc9c6ec08a3 Mon Sep 17 00:00:00 2001 From: "gcp-cherry-pick-bot[bot]" <98988430+gcp-cherry-pick-bot[bot]@users.noreply.github.com> Date: Mon, 18 Nov 2024 20:18:17 -0700 Subject: [PATCH] Don't call setAllowsAutomaticKeyEquivalentLocalization on Big Sur (cherry-pick #20844) (#20846) Cherry-picked Don't call setAllowsAutomaticKeyEquivalentLocalization on Big Sur (#20844) Closes #20821 Release Notes: - Fixed a crash on Big Sur (preview only) Co-authored-by: Conrad Irwin --- crates/gpui/src/platform/mac/platform.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/crates/gpui/src/platform/mac/platform.rs b/crates/gpui/src/platform/mac/platform.rs index b744c658cee1bcae9653cb76793eee60cbd767ca..faf9329734553fc281818724ebeec6f900d3074a 100644 --- a/crates/gpui/src/platform/mac/platform.rs +++ b/crates/gpui/src/platform/mac/platform.rs @@ -343,8 +343,10 @@ impl MacPlatform { ns_string(key_to_native(&keystroke.key).as_ref()), ) .autorelease(); - let _: () = - msg_send![item, setAllowsAutomaticKeyEquivalentLocalization: NO]; + if MacPlatform::os_version().unwrap() >= SemanticVersion::new(12, 0, 0) { + let _: () = + msg_send![item, setAllowsAutomaticKeyEquivalentLocalization: NO]; + } item.setKeyEquivalentModifierMask_(mask); } // For multi-keystroke bindings, render the keystroke as part of the title.