From 864db16e3395139e64f00c6f648682ca3ac7b060 Mon Sep 17 00:00:00 2001
From: Blair Duncan <Blair.Duncan@BBDO.com>
Date: Mon, 23 Apr 2012 23:54:13 -0400
Subject: [PATCH] Fix for issue 1491, don't scroll if active menu container is
 menubar

---
 AppKit/CPMenu/_CPMenuManager.j | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AppKit/CPMenu/_CPMenuManager.j b/AppKit/CPMenu/_CPMenuManager.j
index 16554a4a5..dbf2249b3 100644
--- a/AppKit/CPMenu/_CPMenuManager.j
+++ b/AppKit/CPMenu/_CPMenuManager.j
@@ -161,7 +161,7 @@ var STICKY_TIME_INTERVAL            = 0.5,
 
     var mouseOverMenuView = [activeItem view];
 
-    if (type === CPScrollWheel)
+    if (type === CPScrollWheel ![activeMenuContainer isMenuBar])
         [activeMenuContainer scrollByDelta:[anEvent deltaY]];
 
     if (type === CPPeriodic)