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

Bug Fix: Fix circular bind setter loop in hotkeys

Browse source 
MASShortcut had a potential circular loop in its bindings, let's fix
that right up.

Signed-off-by: Christopher Snowhill <kode54@gmail.com>
This commit is contained in:
Christopher Snowhill 2025-03-09 18:22:48 -07:00
parent 3874d65ec2
commit a3268e6a95
3 changed files with 15 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Application/AppController.m
View file

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

2
Frameworks/shpakovski/MASShortcut

@ -1 +1 @@
Subproject commit c4a91c10e47310dba71782c46577e31117d0b6ef Subproject commit e5e82dcef993dfbae9ac26917b2bb8d4bd000932

29
Preferences/Preferences/GeneralPreferencesPlugin.m
View file

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