From cd9af8e701322c691fd340cb7970586e4d632642 Mon Sep 17 00:00:00 2001
From: Rene Gollent <anevilyak@gmail.com>
Date: Sun, 2 May 2010 01:36:38 +0000
Subject: [PATCH] Reverted r35463 and applied a patch by Stefano to handle the
 Terminal context menu issue a different way. Should fix #5835.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36575 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/kits/interface/Menu.cpp      | 2 ++
 src/kits/interface/PopUpMenu.cpp | 1 +
 2 files changed, 3 insertions(+)

diff --git a/src/kits/interface/Menu.cpp b/src/kits/interface/Menu.cpp
index d0237bbe61..3d8b0006c1 100644
--- a/src/kits/interface/Menu.cpp
+++ b/src/kits/interface/Menu.cpp
@@ -1628,6 +1628,8 @@ BMenu::_Track(int* action, long start)
 		} else if (item != NULL) {
 			_UpdateStateOpenSelect(item, location, navAreaRectAbove,
 				navAreaRectBelow, selectedTime, navigationAreaTime);
+			if (!releasedOnce)
+				releasedOnce = true;
 		} else if (_OverSuper(screenLocation)) {
 			fState = MENU_STATE_TRACKING;
 			UnlockLooper();
diff --git a/src/kits/interface/PopUpMenu.cpp b/src/kits/interface/PopUpMenu.cpp
index 040cb9e8b1..b8bc6d2a77 100644
--- a/src/kits/interface/PopUpMenu.cpp
+++ b/src/kits/interface/PopUpMenu.cpp
@@ -419,6 +419,7 @@ BPopUpMenu::_StartTrack(BPoint where, bool autoInvoke, bool startOpened, BRect *
 
 	// Show the menu's window
 	Show();
+	snooze(50000);
 	BMenuItem *result = Track(startOpened, _specialRect);
 	if (result != NULL && autoInvoke)
 		result->Invoke();