Bug Fix: Fix circular bind setter loop in hotkeys
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:
parent
3874d65ec2
commit
a3268e6a95
3 changed files with 15 additions and 28 deletions
|
@ -210,13 +210,11 @@ static BOOL consentLastEnabled = NO;
|
|||
[randomizeButton setToolTip:NSLocalizedString(@"RandomizeButtonTooltip", @"")];
|
||||
[fileButton setToolTip:NSLocalizedString(@"FileButtonTooltip", @"")];
|
||||
|
||||
if(@available(macOS 15, *)) {
|
||||
[self registerDefaultHotKeys];
|
||||
[self registerDefaultHotKeys];
|
||||
|
||||
[self migrateHotKeys];
|
||||
[self migrateHotKeys];
|
||||
|
||||
[self registerHotKeys];
|
||||
}
|
||||
[self registerHotKeys];
|
||||
|
||||
(void)[spotlightWindowController init];
|
||||
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit c4a91c10e47310dba71782c46577e31117d0b6ef
|
||||
Subproject commit e5e82dcef993dfbae9ac26917b2bb8d4bd000932
|
|
@ -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 {
|
||||
|
|
Loading…
Reference in a new issue