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

Don't assume we have an owner. This fixes a crash in MenuWorld, but needs more investigation

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@13427 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini
2005-07-04 21:31:03 +00:00
parent 7089b0e3dc
commit 1ae414f3c6
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/Menu.cpp
+4 -2
View File
@@ -1224,7 +1224,7 @@ BMenu::RemoveItems(int32 index, int32 count, BMenuItem *_item, bool del)
} }
InvalidateLayout(); InvalidateLayout();
return result; return result;
} }
@@ -1336,9 +1336,11 @@ BMenu::ComputeLayout(int32 index, bool bestFit, bool moveItems,
if ((ResizingMode() & B_FOLLOW_LEFT_RIGHT) == B_FOLLOW_LEFT_RIGHT) { if ((ResizingMode() & B_FOLLOW_LEFT_RIGHT) == B_FOLLOW_LEFT_RIGHT) {
if (Parent()) if (Parent())
*width = Parent()->Frame().Width() + 1; *width = Parent()->Frame().Width() + 1;
else else if (Window())
*width = Window()->Frame().Width() + 1; *width = Window()->Frame().Width() + 1;
// TODO: We are left without a valid width here ?!?
*height = frame.Height(); *height = frame.Height();
} else { } else {
*width = frame.Width(); *width = frame.Width();