From fd57ed12bb9e2627a1a55f7c9f658db1aa86ac95 Mon Sep 17 00:00:00 2001 From: Christopher Snowhill Date: Fri, 7 Mar 2025 17:49:47 -0800 Subject: [PATCH] Bug Fix: Disable hotkeys configuration on macOS<15 MASShortcutView is apparently buggy on older macOS versions. So everyone there gets hard coded shortcuts and nothing else. Signed-off-by: Christopher Snowhill --- .../Preferences/GeneralPreferencesPlugin.m | 30 ++++++++++++------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/Preferences/Preferences/GeneralPreferencesPlugin.m b/Preferences/Preferences/GeneralPreferencesPlugin.m index 12bc1e135..c62162adc 100644 --- a/Preferences/Preferences/GeneralPreferencesPlugin.m +++ b/Preferences/Preferences/GeneralPreferencesPlugin.m @@ -41,16 +41,26 @@ [[NSBundle bundleWithIdentifier:@"org.cogx.cog.preferences"] loadNibNamed:@"Preferences" owner:plugin topLevelObjects:nil]; - - return @[[plugin playlistPane], - [plugin hotKeyPane], - [plugin updatesPane], - [plugin outputPane], - [plugin generalPane], - [plugin notificationsPane], - [plugin appearancePane], - [plugin midiPane], - [plugin rubberbandPane]]; + if(@available(macOS 15, *)) { + return @[[plugin playlistPane], + [plugin hotKeyPane], + [plugin updatesPane], + [plugin outputPane], + [plugin generalPane], + [plugin notificationsPane], + [plugin appearancePane], + [plugin midiPane], + [plugin rubberbandPane]]; + } else { + return @[[plugin playlistPane], + [plugin updatesPane], + [plugin outputPane], + [plugin generalPane], + [plugin notificationsPane], + [plugin appearancePane], + [plugin midiPane], + [plugin rubberbandPane]]; + } } - (HotKeyPane *)hotKeyPane {