From 02c491fd7e021ce410090c7805544e7739baf35b Mon Sep 17 00:00:00 2001 From: Stefano Ceccherini Date: Wed, 5 Apr 2006 19:01:41 +0000 Subject: [PATCH] small cleanup git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17014 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/interface/MenuField.cpp | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/src/kits/interface/MenuField.cpp b/src/kits/interface/MenuField.cpp index 592e3974f8..0acd7df360 100644 --- a/src/kits/interface/MenuField.cpp +++ b/src/kits/interface/MenuField.cpp @@ -632,38 +632,34 @@ BMenuField::InitMenu(BMenu *menu) long BMenuField::MenuTask(void *arg) { - BMenuField *menuField = (BMenuField*)arg; + BMenuField *menuField = static_cast(arg); - if (!menuField->LockLooper()) - return 0; - - menuField->fSelected = true; - menuField->fTransition = true; - menuField->Invalidate(); - - menuField->UnlockLooper(); + if (menuField->LockLooper()) { + menuField->fSelected = true; + menuField->fTransition = true; + menuField->Invalidate(); + menuField->UnlockLooper(); + } bool tracking; - do { snooze(20000); if (!menuField->LockLooper()) - return 0; + break; tracking = menuField->fMenuBar->fTracking; menuField->UnlockLooper(); } while (tracking); - if (!menuField->LockLooper()) - return 0; + if (menuField->LockLooper()) { + menuField->fSelected = false; + menuField->fTransition = true; + menuField->Invalidate(); + menuField->UnlockLooper(); + } - menuField->fSelected = false; - menuField->fTransition = true; - menuField->Invalidate(); - - menuField->UnlockLooper(); return 0; }