From 68c442e5c2b7d9cd402e34acb93bb81db8e39b1b Mon Sep 17 00:00:00 2001 From: Stefano Ceccherini Date: Thu, 1 Jun 2006 20:03:20 +0000 Subject: [PATCH] small cleanup, removed now unneeded hack git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17695 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/interface/PopUpMenu.cpp | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/src/kits/interface/PopUpMenu.cpp b/src/kits/interface/PopUpMenu.cpp index 750dc90337..06627b2d56 100644 --- a/src/kits/interface/PopUpMenu.cpp +++ b/src/kits/interface/PopUpMenu.cpp @@ -264,14 +264,6 @@ BMenuItem * BPopUpMenu::_go(BPoint where, bool autoInvoke, bool startOpened, BRect *_specialRect, bool async) { - if (fTrackThread >= 0) { - // Something bad happened: Go() was called on us twice, and we got here - // while the other instance hasn't finished yet. - // TODO: Maybe we should simply call debugger() ? - status_t unused; - wait_for_thread(fTrackThread, &unused); - } - BMenuItem *selected = NULL; // Can't use Window(), as the BPopUpMenu isn't attached @@ -343,15 +335,12 @@ BPopUpMenu::entry(void *arg) { popup_menu_data *data = static_cast(arg); BPopUpMenu *menu = data->object; - BPoint where = data->where; BRect *rect = NULL; - bool autoInvoke = data->autoInvoke; - bool startOpened = data->startOpened; - + if (data->useRect) rect = &data->rect; - data->selected = menu->start_track(where, autoInvoke, startOpened, rect); + data->selected = menu->start_track(data->where, data->autoInvoke, data->startOpened, rect); // Reset the window menu semaphore if (data->async && data->window)