Navigation Menu

Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Don't attempt to show the prefs on relaunch if the window isn't open when quitting, fixes #526 #962

Merged
merged 2 commits into from Jul 12, 2012
Merged

Don't attempt to show the prefs on relaunch if the window isn't open when quitting, fixes #526 #962

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b039e1
Don't attempt to show the prefs on relaunch if the window isn't open …
pjrobertson Jun 26, 2012
6ad2e88
Unset the QSVisiblePrefPane env once the prefs have opened
pjrobertson Jul 12, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion Quicksilver/Code-App/QSController.m
View file
Open in desktop
Expand Up @@ -985,8 +985,10 @@ - (void)startQuicksilver:(id)sender {
[self runSetupAssistant:nil];
}
char *visiblePref = getenv("QSVisiblePrefPane");
if (visiblePref)
if (visiblePref) {
[QSPreferencesController showPaneWithIdentifier:[NSString stringWithUTF8String:visiblePref]];
unsetenv("QSVisiblePrefPane");
}

[QSResourceManager sharedInstance];
[[QSTriggerCenter sharedInstance] activateTriggers];
Expand Down
8 changes: 5 additions & 3 deletions Quicksilver/Code-App/QSPreferencesController.m
View file
Open in desktop
Expand Up @@ -70,9 +70,11 @@ - (id)init {
}

- (void)applicationWillRelaunch:(NSNotification *)notif {
id theID;
if (theID = [[[moduleController selectedObjects] lastObject] objectForKey:kItemID])
setenv("QSVisiblePrefPane", [theID UTF8String] , YES);
if ([[self window] isVisible]) {
id theID;
if (theID = [[[moduleController selectedObjects] lastObject] objectForKey:kItemID])
setenv("QSVisiblePrefPane", [theID UTF8String] , YES);
}
}

- (void)awakeFromNib {
Expand Down