From 7db6c3677040e038c03215e1d4de48d21ef96e43 Mon Sep 17 00:00:00 2001 From: Zorg Date: Fri, 10 Jun 2022 21:20:24 -0700 Subject: [PATCH 1/2] Show checking window back in focus and activate app if needed --- Sparkle/SPUStandardUserDriver.m | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Sparkle/SPUStandardUserDriver.m b/Sparkle/SPUStandardUserDriver.m index f1e67a549c..9fbce16e03 100644 --- a/Sparkle/SPUStandardUserDriver.m +++ b/Sparkle/SPUStandardUserDriver.m @@ -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 + [NSApp activateIgnoringOtherApps:YES]; } } From 90165d7d02c621e677e7af74e79b89007e569e52 Mon Sep 17 00:00:00 2001 From: Zorg Date: Fri, 10 Jun 2022 21:24:55 -0700 Subject: [PATCH 2/2] Add comment example why we need to re-activate app --- Sparkle/SPUStandardUserDriver.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sparkle/SPUStandardUserDriver.m b/Sparkle/SPUStandardUserDriver.m index 9fbce16e03..4014993afa 100644 --- a/Sparkle/SPUStandardUserDriver.m +++ b/Sparkle/SPUStandardUserDriver.m @@ -454,7 +454,7 @@ - (void)showUpdateInFocus } if (mayNeedToActivateApp && ![NSApp isActive]) { - // Make the app active if it's not already active + // Make the app active if it's not already active, e.g, from a menu bar extra [NSApp activateIgnoringOtherApps:YES]; } }