Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-11-29 20:06:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'upstream' into feature/stickers-upgrade

Browse source
This commit is contained in:
hunbernd 2019-12-23 23:54:55 +01:00
commit 33236aeca3
1256 changed files with 11564 additions and 57117 deletions
Download patch file Download diff file Expand all files Collapse all files

5
retroshare-gui/src/gui/common/FriendListModel.cpp
View file

@ -178,12 +178,13 @@ int RsFriendListModel::rowCount(const QModelIndex& parent) const
return mGroups[index.group_index].child_profile_indices.size();
if(index.type == ENTRY_TYPE_PROFILE)
{
if(index.group_index < UNDEFINED_GROUP_INDEX_VALUE)
return mProfiles[mGroups[index.group_index].child_profile_indices[index.profile_index]].child_node_indices.size();
else
return mProfiles[index.profile_index].child_node_indices.size();
if(index.type == ENTRY_TYPE_NODE)
}
else //if(index.type == ENTRY_TYPE_NODE)
return 0;
}