diff --git a/Application/AppController.m b/Application/AppController.m index 4acde2fac..cbbea9b48 100644 --- a/Application/AppController.m +++ b/Application/AppController.m @@ -210,13 +210,11 @@ static BOOL consentLastEnabled = NO; [randomizeButton setToolTip:NSLocalizedString(@"RandomizeButtonTooltip", @"")]; [fileButton setToolTip:NSLocalizedString(@"FileButtonTooltip", @"")]; - if(@available(macOS 15, *)) { - [self registerDefaultHotKeys]; - - [self migrateHotKeys]; - - [self registerHotKeys]; - } + [self registerDefaultHotKeys]; + + [self migrateHotKeys]; + + [self registerHotKeys]; (void)[spotlightWindowController init]; diff --git a/Frameworks/shpakovski/MASShortcut b/Frameworks/shpakovski/MASShortcut index c4a91c10e..e5e82dcef 160000 --- a/Frameworks/shpakovski/MASShortcut +++ b/Frameworks/shpakovski/MASShortcut @@ -1 +1 @@ -Subproject commit c4a91c10e47310dba71782c46577e31117d0b6ef +Subproject commit e5e82dcef993dfbae9ac26917b2bb8d4bd000932 diff --git a/Preferences/Preferences/GeneralPreferencesPlugin.m b/Preferences/Preferences/GeneralPreferencesPlugin.m index 18343c2f6..7c191268e 100644 --- a/Preferences/Preferences/GeneralPreferencesPlugin.m +++ b/Preferences/Preferences/GeneralPreferencesPlugin.m @@ -41,26 +41,15 @@ [[NSBundle bundleWithIdentifier:@"org.cogx.cog.preferences"] loadNibNamed:@"Preferences" owner:plugin topLevelObjects:nil]; - 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]]; - } + return @[[plugin playlistPane], + [plugin hotKeyPane], + [plugin updatesPane], + [plugin outputPane], + [plugin generalPane], + [plugin notificationsPane], + [plugin appearancePane], + [plugin midiPane], + [plugin rubberbandPane]]; } - (HotKeyPane *)hotKeyPane {