chris/Cog
2
1
Fork 0
Code Issues 65 Pull requests Projects Releases Packages Wiki Activity Actions

Disable global hotkeys again for macOS < 15.0

Browse source 
Clearly, NSUserDefaults bindings were not really meant to be used in
practice at all, as they do nothing but crash the app.

Signed-off-by: Christopher Snowhill <kode54@gmail.com>
This commit is contained in:
Christopher Snowhill 2025-03-09 14:23:59 -07:00
parent 6036000214
commit 05f2434462
2 changed files with 27 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Application/AppController.m
View file

@ -210,11 +210,13 @@ static BOOL consentLastEnabled = NO;
[randomizeButton setToolTip:NSLocalizedString(@"RandomizeButtonTooltip", @"")]; [randomizeButton setToolTip:NSLocalizedString(@"RandomizeButtonTooltip", @"")];
[fileButton setToolTip:NSLocalizedString(@"FileButtonTooltip", @"")]; [fileButton setToolTip:NSLocalizedString(@"FileButtonTooltip", @"")];
[self registerDefaultHotKeys]; if(@available(macOS 15, *)) {
[self registerDefaultHotKeys];
[self migrateHotKeys];
[self migrateHotKeys];
[self registerHotKeys];
[self registerHotKeys];
}
(void)[spotlightWindowController init]; (void)[spotlightWindowController init];

29
Preferences/Preferences/GeneralPreferencesPlugin.m
View file

@ -41,15 +41,26 @@
[[NSBundle bundleWithIdentifier:@"org.cogx.cog.preferences"] loadNibNamed:@"Preferences" [[NSBundle bundleWithIdentifier:@"org.cogx.cog.preferences"] loadNibNamed:@"Preferences"
owner:plugin owner:plugin
topLevelObjects:nil]; topLevelObjects:nil];
return @[[plugin playlistPane], if(@available(macos 15, *)) {
[plugin hotKeyPane], return @[[plugin playlistPane],
[plugin updatesPane], [plugin hotKeyPane],
[plugin outputPane], [plugin updatesPane],
[plugin generalPane], [plugin outputPane],
[plugin notificationsPane], [plugin generalPane],
[plugin appearancePane], [plugin notificationsPane],
[plugin midiPane], [plugin appearancePane],
[plugin rubberbandPane]]; [plugin midiPane],
[plugin rubberbandPane]];
} else {
return @[[plugin playlistPane],
[plugin updatesPane],
[plugin outputPane],
[plugin generalPane],
[plugin notificationsPane],
[plugin appearancePane],
[plugin midiPane],
[plugin rubberbandPane]];
}
} }
- (HotKeyPane *)hotKeyPane { - (HotKeyPane *)hotKeyPane {