Merge branch 'master' of github.com:gnachman/iTerm2

andrewsmedina · May 3, 2011 · 749b165 · 749b165
2 parents 5469e0f + 50dde30
commit 749b165
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/iTermController.m b/iTermController.m
@@ -946,7 +946,7 @@ static void RollInHotkeyTerm(PseudoTerminal* term)
         case WINDOW_TYPE_FULL_SCREEN:
             [[NSAnimationContext currentContext] setDuration:[[PreferencePanel sharedInstance] hotkeyTermAnimationDuration]];
             [[[term window] animator] setAlphaValue:1];
-            [NSMenu setMenuBarVisible:NO];
+            [term hideMenuBar];
             break;
     }
     [[iTermController sharedInstance] performSelector:@selector(rollInFinished)
@@ -1502,7 +1502,7 @@ - (void)setCurrentTerminal:(PseudoTerminal*)thePseudoTerminal
     if ([thePseudoTerminal windowInited] && [[thePseudoTerminal window] isKeyWindow] == NO) {
         [[thePseudoTerminal window] makeKeyAndOrderFront: self];
         if ([thePseudoTerminal fullScreen]) {
-            [NSMenu setMenuBarVisible:NO];
+          [thePseudoTerminal hideMenuBar];
         }
     }