[haiku-commits] haiku: hrev46406 - src/kits/interface
- From: julian.harnath@xxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Fri, 22 Nov 2013 11:39:01 +0100 (CET)
hrev46406 adds 1 changeset to branch 'master'
old head: c70a1cf8364c70248410866e022f48ffe2e337f0
new head: eb539d59e7d26369ad2cbb9b3780cfdbc78a8a37
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=eb539d5+%5Ec70a1cf
----------------------------------------------------------------------------
eb539d5: Don't try to open another menu window if there already is one.
* Fixes crash when using Gobe Productive toolbar.
[ Julian Harnath <julian.harnath@xxxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev46406
Commit: eb539d59e7d26369ad2cbb9b3780cfdbc78a8a37
URL: http://cgit.haiku-os.org/haiku/commit/?id=eb539d5
Author: Julian Harnath <julian.harnath@xxxxxxxxxxxxxx>
Date: Fri Nov 22 10:34:55 2013 UTC
----------------------------------------------------------------------------
1 file changed, 3 insertions(+)
src/kits/interface/Menu.cpp | 3 +++
----------------------------------------------------------------------------
diff --git a/src/kits/interface/Menu.cpp b/src/kits/interface/Menu.cpp
index e9a68e2..f3a6c5c 100644
--- a/src/kits/interface/Menu.cpp
+++ b/src/kits/interface/Menu.cpp
@@ -1499,6 +1499,9 @@ BMenu::_InitData(BMessage* archive)
bool
BMenu::_Show(bool selectFirstItem, bool keyDown)
{
+ if (Window() != NULL)
+ return false;
+
// See if the supermenu has a cached menuwindow,
// and use that one if possible.
BMenuWindow* window = NULL;
Other related posts:
