Skip to content

Commit

Permalink
10.6 QL fix: don't try and close the QS window if QL is open
Browse files Browse the repository at this point in the history
  • Loading branch information
pjrobertson committed Mar 14, 2012
1 parent 7da7562 commit d6a3b06
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions Quicksilver/Code-QuickStepInterface/QSInterfaceController.m
Expand Up @@ -181,13 +181,13 @@ - (void)willHideMainWindow:(id)sender {
[[NSNotificationCenter defaultCenter] postNotificationName:@"InterfaceDeactivated" object:self];
[[self window] makeFirstResponder:nil];
}
}

- (void)hideMainWindowWithEffect:(id)effect {
// Close the Quicklook panel if the QS window closes
if([QLPreviewPanel sharedPreviewPanelExists] && [[QLPreviewPanel sharedPreviewPanel] isVisible]) {
[(QSSearchObjectView *)[[QLPreviewPanel sharedPreviewPanel] delegate] closePreviewPanel];
}
}

- (void)hideMainWindowWithEffect:(id)effect {
[self willHideMainWindow:nil];
[self setHiding:YES];
if (effect && [[NSUserDefaults standardUserDefaults] boolForKey:kUseEffects])
Expand Down Expand Up @@ -465,6 +465,10 @@ - (BOOL)windowShouldClose:(id)sender {
- (void)windowDidResignMain:(NSNotification *)aNotification {}

- (void)windowDidResignKey:(NSNotification *)aNotification {
// Close the Quicklook panel if the QS window closes
if([QLPreviewPanel sharedPreviewPanelExists] && [[QLPreviewPanel sharedPreviewPanel] isVisible]) {
return;
}
if ([aNotification object] == [self window]) {
if (hidingWindow) return;
if ([hideTimer isValid]) {
Expand Down

0 comments on commit d6a3b06

Please sign in to comment.