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.

Sign up for GitHub

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

Show checking window back in focus and activate app if needed #2150

Merged
merged 2 commits into from
Jun 11, 2022
Merged

Show checking window back in focus and activate app if needed #2150

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7db6c36
Show checking window back in focus and activate app if needed
zorgiepoo Jun 11, 2022
90165d7
Add comment example why we need to re-activate app
zorgiepoo Jun 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions Sparkle/SPUStandardUserDriver.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,12 +436,26 @@ - (void)showUpdateReleaseNotesFailedToDownloadWithError:(NSError *)error

- (void)showUpdateInFocus
{
BOOL mayNeedToActivateApp;
if (self.activeUpdateAlert != nil) {
[self setUpActiveUpdateAlertForScheduledUpdate:nil state:nil];
mayNeedToActivateApp = NO;
} else if (self.permissionPrompt != nil) {
[self.permissionPrompt showWindow:nil];
mayNeedToActivateApp = YES;
} else if (self.statusController != nil) {
[self.statusController showWindow:nil];
mayNeedToActivateApp = YES;
} else if (self.checkingController != nil) {
[self.checkingController showWindow:nil];
mayNeedToActivateApp = YES;
} else {
mayNeedToActivateApp = NO;
}

if (mayNeedToActivateApp && ![NSApp isActive]) {
// Make the app active if it's not already active, e.g, from a menu bar extra
[NSApp activateIgnoringOtherApps:YES];
}
}

Expand Down