From 37cf3d970dd0ca905fac555a7a117972a89ec439 Mon Sep 17 00:00:00 2001
From: Stefano Ceccherini <stefano.ceccherini@gmail.com>
Date: Wed, 22 Mar 2006 21:07:35 +0000
Subject: [PATCH] Avoid attaching a menu to the BMenuWindow when not needed

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

diff --git a/src/kits/interface/Menu.cpp b/src/kits/interface/Menu.cpp
index 5e516010c2..54570a43f0 100644
--- a/src/kits/interface/Menu.cpp
+++ b/src/kits/interface/Menu.cpp
@@ -1606,7 +1606,7 @@ BMenu::MenuWindow()
 	if (fCachedMenuWindow == NULL) {
 		char windowName[64];
 		snprintf(windowName, 64, "%s cached menu", Name());
-		fCachedMenuWindow = new BMenuWindow(windowName, this);
+		fCachedMenuWindow = new BMenuWindow(windowName, NULL);
 	}
 
 	return fCachedMenuWindow;
diff --git a/src/kits/interface/MenuWindow.cpp b/src/kits/interface/MenuWindow.cpp
index ba2c910e5f..ed18883ed2 100644
--- a/src/kits/interface/MenuWindow.cpp
+++ b/src/kits/interface/MenuWindow.cpp
@@ -38,7 +38,8 @@ BMenuWindow::BMenuWindow(const char *name, BMenu *menu)
 	fUpperScroller(NULL),
 	fLowerScroller(NULL)
 {
-	SetMenu(menu);
+	if (menu != NULL)
+		SetMenu(menu);
 }