From 7d73ca9b418aa67143f5605fd1c30d02ac456654 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hor=C3=A1=C4=8Dek?= Date: Fri, 22 Feb 2013 18:46:41 +0100 Subject: [PATCH] code cleanup --- interface/src/InterfaceMacOSX.mm | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/interface/src/InterfaceMacOSX.mm b/interface/src/InterfaceMacOSX.mm index 500dd6efc8..466212207b 100644 --- a/interface/src/InterfaceMacOSX.mm +++ b/interface/src/InterfaceMacOSX.mm @@ -37,13 +37,12 @@ static Oscilloscope *sharedAudioScope; void initMacOSXMenu(Oscilloscope *audioScope) { - sharedAudioScope = audioScope; - @autoreleasepool { if (NSApp) { if (!sharedInterfaceMainMenuTarget) { sharedInterfaceMainMenuTarget = [[InterfaceMainMenuTarget alloc] init]; } + sharedAudioScope = audioScope; NSMenu *mainMenu = [NSApp mainMenu]; @@ -55,17 +54,15 @@ void initMacOSXMenu(Oscilloscope *audioScope) { NSMenu *scopeMenu = [[[NSMenu alloc] init] initWithTitle:@"Scope"]; [scopeMenuItem setSubmenu:scopeMenu]; sharedInterfaceMainMenuTarget.scopeAudioMenuItem = [scopeMenu addItemWithTitle:@"Audio" - action:@selector(scopeAudioAction) - keyEquivalent:@""]; + action:@selector(scopeAudioAction) + keyEquivalent:@""]; [sharedInterfaceMainMenuTarget.scopeAudioMenuItem setTarget:sharedInterfaceMainMenuTarget]; [sharedInterfaceMainMenuTarget.scopeAudioMenuItem setState:NSOnState]; sharedInterfaceMainMenuTarget.scopeNoneMenuItem = [scopeMenu addItemWithTitle:@"None" - action:@selector(scopeNoneAction) - keyEquivalent:@""]; + action:@selector(scopeNoneAction) + keyEquivalent:@""]; [sharedInterfaceMainMenuTarget.scopeNoneMenuItem setTarget:sharedInterfaceMainMenuTarget]; - - [NSApp setMainMenu:mainMenu]; } } }