Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accidentally broke CountItemsUnder() for invalid items with previous commit. This fixes

Browse Source 
VLC, which for some reason calls CountItemsUnder(NULL) quite a few times on startup.



git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@26167 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Rene Gollent 2008-06-29 18:54:28 +00:00
parent f41c3a5bcd
commit fa366cbe40
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/kits/interface/OutlineListView.cpp
View File

@ -688,24 +688,24 @@ int32
BOutlineListView::CountItemsUnder(BListItem* underItem,
bool oneLevelOnly) const
{
int32 i = FullListIndexOf(underItem) + 1;
int32 i = FullListIndexOf(underItem);
if (i == -1)
return 0;
++i;
int32 count = 0;
uint32 baseLevel = underItem->OutlineLevel();
while (i < FullListCountItems()) {
for (; i < FullListCountItems(); i++) {
BListItem *item = FullListItemAt(i);
// If we jump out of the subtree, return count
if (item->fLevel <= underItem->OutlineLevel())
if (item->fLevel <= baseLevel)
return count;
// If the level matches, increase count
if (!oneLevelOnly || item->fLevel == underItem->OutlineLevel() + 1)
if (!oneLevelOnly || item->fLevel == baseLevel + 1)
count++;
i++;
}
return count;