ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid a crash in friends list.

Browse Source 
Not my fault, but indeed it was crashing when you enabled sorting and then opened friends list in your friend profile.
This commit is contained in:
Deve 2018-10-19 22:44:53 +02:00
parent acc920c14f
commit e4b8c9eac2
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/states_screens/online/online_profile_friends.cpp
View File

@ -195,9 +195,18 @@ bool OnlineProfileFriends::compareFriends(int f1, int f2)
void OnlineProfileFriends::displayResults()
{
m_friends_list_widget->clear();
OnlineProfile::IDList friends = m_visiting_profile->getFriends();
(m_sort_desc && !m_sort_default) ? std::sort(friends.rbegin(), friends.rend(), compareFriends)
: std::sort(friends.begin(), friends.end(), compareFriends);
if (m_sort_desc && !m_sort_default)
{
std::sort(friends.rbegin(), friends.rend(), compareFriends);
}
else
{
std::sort(friends.begin(), friends.end(), compareFriends);
}
for (unsigned int i = 0; i < friends.size(); i++)
{
std::vector<ListWidget::ListCell> row;
@ -245,8 +254,17 @@ void OnlineProfileFriends::onUpdate(float delta)
{
if(m_waiting_for_friends)
{
if(m_visiting_profile->hasFetchedFriends())
if (m_visiting_profile->hasFetchedFriends())
{
// When browsing other users friends there is no Since/Status
// columns, so force sorting by name
if (!m_visiting_profile->isCurrentUser() && m_sort_column != 0)
{
m_sort_column = 0;
m_sort_desc = false;
m_sort_default = true;
}
displayResults();
}
else