Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Perform `showEntryInCatalog` method on main thread #716

Merged
merged 1 commit into from

2 participants

@pjrobertson
Owner

Fixes #714

This action needs to run on the main thread or you can get an exception if the QS preferences hasn't been opened previously.

@skurfer
Owner

Looks good. Merging, but leaving the build number alone until our discussion on the dev list progresses.

@skurfer skurfer merged commit 85756a1 into quicksilver:master
@pjrobertson
Owner
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Feb 22, 2012
  1. @pjrobertson
This page is out of date. Refresh to see the latest.
View
4 Quicksilver/PlugIns-Main/QSCorePlugIn/Code/QSCatalogEntrySource.m
@@ -132,8 +132,8 @@ - (NSArray *)validActionsForDirectObject:(QSObject *)dObject indirectObject:(QSO
}
- (QSObject *)show:(QSObject *)dObject {
- [NSClassFromString(@"QSCatalogPrefPane") showEntryInCatalog:[[QSLibrarian sharedInstance] entryForID:[dObject objectForType:QSCatalogEntryPboardType]]];
- return nil;
+ [NSClassFromString(@"QSCatalogPrefPane") performSelectorOnMainThread:@selector(showEntryInCatalog:) withObject:[[QSLibrarian sharedInstance] entryForID:[dObject objectForType:QSCatalogEntryPboardType]] waitUntilDone:NO];
+ return nil;
}
- (QSObject *)rescan:(QSObject *)dObject {
View
5 Quicksilver/PlugIns-Main/QSCorePlugIn/Code/QSObjectActions.m
@@ -77,8 +77,9 @@ - (QSObject *)findObjectInCatalog:(QSObject *)dObject {
QSCatalogEntry *theEntry = [[QSLibrarian sharedInstance] firstEntryContainingObject:dObject];
- [NSClassFromString(@"QSCatalogPrefPane") showEntryInCatalog:theEntry];
- return nil;
+ [NSClassFromString(@"QSCatalogPrefPane") performSelectorOnMainThread:@selector(showEntryInCatalog:) withObject:theEntry waitUntilDone:NO];
+
+ return nil;
}
- (NSWindow *)windowForObject:(QSObject *)object atPoint:(NSPoint)loc {
Something went wrong with that request. Please try again.