i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Fixed a possible crash when removing and adding items from a window.

Browse Source 
* This does not yet close bug #233, but could also be a reason for this crash.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16851 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2006-03-21 17:49:42 +00:00
parent 7a2c9b35cd
commit e87965deed
1 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/Menu.cpp
+18 -15
View File
@@ -1069,20 +1069,18 @@ BMenu::_show(bool selectFirstItem)
if (window == NULL) if (window == NULL)
return false; return false;
if (!window->IsLocked()) window->Lock();
window->Lock();
window->ChildAt(0)->AddChild(this); window->ChildAt(0)->AddChild(this);
if (fSuper != NULL) if (fSuper != NULL)
fSuperbounds = fSuper->ConvertToScreen(fSuper->Bounds()); fSuperbounds = fSuper->ConvertToScreen(fSuper->Bounds());
// TODO: for some reason, Window() can already be NULL at this point,
// which causes a crash in one of the following functions...
UpdateWindowViewSize(); UpdateWindowViewSize();
window->Show(); window->Show();
if (window->IsLocked()) window->Unlock();
window->Unlock();
return true; return true;
} }
@@ -1104,7 +1102,7 @@ BMenu::_hide()
window->Hide(); window->Hide();
window->ChildAt(0)->RemoveChild(this); window->ChildAt(0)->RemoveChild(this);
// we don't want to be deleted when the window is removed // we don't want to be deleted when the window is removed
// Only quit if the window isn't cached. The cached menu window // Only quit if the window isn't cached. The cached menu window
// will be deleted at the end of BMenu::_track(). // will be deleted at the end of BMenu::_track().
if (menuWindow != window) if (menuWindow != window)
@@ -1242,18 +1240,20 @@ BMenu::_AddItem(BMenuItem *item, int32 index)
bool bool
BMenu::RemoveItems(int32 index, int32 count, BMenuItem *item, bool del) BMenu::RemoveItems(int32 index, int32 count, BMenuItem *item, bool deleteItems)
{ {
bool success = false; bool success = false;
bool invalidateLayout = false; bool invalidateLayout = false;
bool locked = LockLooper();
// The plan is simple: If we're given a BMenuItem directly, we use it // The plan is simple: If we're given a BMenuItem directly, we use it
// and ignore index and count. Otherwise, we use them instead. // and ignore index and count. Otherwise, we use them instead.
if (item != NULL) { if (item != NULL) {
if (fItems.RemoveItem(item)) { if (fItems.RemoveItem(item)) {
item->SetSuper(NULL); item->SetSuper(NULL);
item->Uninstall(); item->Uninstall();
if (del) if (deleteItems)
delete item; delete item;
success = invalidateLayout = true; success = invalidateLayout = true;
} }
@@ -1270,7 +1270,7 @@ BMenu::RemoveItems(int32 index, int32 count, BMenuItem *item, bool del)
if (fItems.RemoveItem(item)) { if (fItems.RemoveItem(item)) {
item->SetSuper(NULL); item->SetSuper(NULL);
item->Uninstall(); item->Uninstall();
if (del) if (deleteItems)
delete item; delete item;
success = true; success = true;
invalidateLayout = true; invalidateLayout = true;
@@ -1281,11 +1281,14 @@ BMenu::RemoveItems(int32 index, int32 count, BMenuItem *item, bool del)
} }
} }
} }
} }
if (invalidateLayout && Window() != NULL && fResizeToFit) if (invalidateLayout && locked && fResizeToFit)
InvalidateLayout(); InvalidateLayout();
if (locked)
UnlockLooper();
return success; return success;
} }