Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Release #1390

Merged
merged 2 commits into from

2 participants

@pjrobertson
Owner

A few fixes

  • Attempt to fix a crash (heh)
  • Sort triggers by name
@pjrobertson
Owner

Soo.... merge → next pre? :)

(@skurfer)

@skurfer
Owner

Yes. Sorry for the delay. I had some unfounded concerns about this. It turned out to be my misuse of git. :-)

@skurfer skurfer merged commit fc5dd7a into quicksilver:release
@skurfer skurfer referenced this pull request from a commit
@skurfer skurfer mention #1390 in the release notes 1510c8e
@pjrobertson pjrobertson deleted the pjrobertson:release branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
View
4 Quicksilver/Code-QuickStepCore/QSCommand.m
@@ -72,7 +72,9 @@ - (NSArray *)validIndirectObjectsForAction:(NSString *)action directObject:(QSOb
[triggerType setObject:key forType:QSTriggerTypeType];
[triggerTypesObjects addObject:triggerType];
}
- return triggerTypesObjects;
+ return [triggerTypesObjects sortedArrayWithOptions:NSSortConcurrent usingComparator:^NSComparisonResult(QSObject *obj1, QSObject *obj2) {
+ return [[obj1 name] localizedCompare:[obj2 name]];
+ }];
} else {
return [NSArray arrayWithObject:[QSObject textProxyObjectWithDefaultValue:@""]];
}
View
4 Quicksilver/Code-QuickStepCore/QSObject.m
@@ -655,10 +655,8 @@ - (NSString *)identifier {
id handler = nil;
if (handler = [self handlerForSelector:@selector(identifierForObject:)]) {
- ident = [handler identifierForObject:self];
+ ident = [[[handler identifierForObject:self] retain] autorelease];
}
- if (!ident)
- ident = [meta objectForKey:kQSObjectObjectID];
[self setIdentifier:ident];
return ident;
Something went wrong with that request. Please try again.