Mirrors/BackgroundMusic
2
0
Fork 0
mirror of https://github.com/kyleneideck/BackgroundMusic synced 2024-11-23 12:43:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't quit BGMApp if BGMXPCHelper is missing. See #76.

Browse source
This commit is contained in:
Kyle Neideck 2016-09-26 11:08:19 +10:00
parent e31f2b1c29
commit d38ea256cd
1 changed files with 29 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
BGMApp/BGMApp/AppDelegate.mm
View file

@ -42,6 +42,9 @@ static float const kStatusBarIconPadding = 0.25;
// for the app. These are called "menu bar extras" in the Human Interface Guidelines.
NSStatusItem* statusBarItem;
// Only show the 'BGMXPCHelper is missing' error dialog once.
BOOL haveShownXPCHelperErrorMessage;
BGMAutoPauseMusic* autoPauseMusic;
BGMAutoPauseMenuItem* autoPauseMenuItem;
BGMMusicPlayers* musicPlayers;
@ -52,6 +55,8 @@ static float const kStatusBarIconPadding = 0.25;
}
- (void) awakeFromNib {
haveShownXPCHelperErrorMessage = NO;
// Set up the status bar item
statusBarItem = [[NSStatusBar systemStatusBar] statusItemWithLength:NSSquareStatusItemLength];
@ -103,7 +108,11 @@ static float const kStatusBarIconPadding = 0.25;
xpcListener = [[BGMXPCListener alloc] initWithAudioDevices:audioDevices
helperConnectionErrorHandler:^(NSError* error) {
[self showXPCHelperErrorMessageAndExit:error];
NSLog(@"AppDelegate::applicationDidFinishLaunching: (helperConnectionErrorHandler) "
"BGMXPCHelper connection error: %@",
error);
[self showXPCHelperErrorMessage:error];
}];
appVolumes = [[BGMAppVolumes alloc] initWithMenu:self.bgmMenu
@ -142,7 +151,10 @@ static float const kStatusBarIconPadding = 0.25;
});
}
- (void) showXPCHelperErrorMessageAndExit:(NSError*)error {
- (void) showXPCHelperErrorMessage:(NSError*)error {
if (!haveShownXPCHelperErrorMessage) {
haveShownXPCHelperErrorMessage = YES;
// NSAlert should only be used on the main thread.
dispatch_async(dispatch_get_main_queue(), ^{
NSAlert* alert = [NSAlert new];
@ -150,15 +162,16 @@ static float const kStatusBarIconPadding = 0.25;
// TODO: Offer to install BGMXPCHelper if it's missing.
[alert setMessageText:@"Error connecting to BGMXPCHelper."];
[alert setInformativeText:[NSString stringWithFormat:@"%s%s%@ (%lu)",
"Make sure you have BGMXPCHelper installed. There are instructions in the README.md file.",
"Make sure you have BGMXPCHelper installed. There are instructions in the "
"README.md file.\n\n"
"Background Music might still work, but it won't work as well as it could.",
"\n\nDetails:\n",
[error localizedDescription],
[error code]]];
[alert runModal];
[NSApp terminate:self];
});
}
}
- (void) applicationWillTerminate:(NSNotification*)aNotification {
#pragma unused (aNotification)