celisej567/abaddon
1
0
Fork 0
mirror of https://github.com/celisej567/abaddon.git synced 2026-09-19 20:11:59 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

crash fixes

Browse Source
This commit is contained in:
ouwou
2020-08-29 16:38:52 -04:00
parent 713ed0f927
commit 4b637b6ff2
5 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
discord/discord.cpp
View File

@@ -65,11 +65,13 @@ std::vector<std::pair<Snowflake, GuildData>> DiscordClient::GetUserSortedGuilds(
// unpositioned_guilds now has unpositioned guilds in ascending order
for (auto it = unpositioned_guilds.rbegin(); it != unpositioned_guilds.rend(); it++)
sorted_guilds.push_back(std::make_pair(*it, m_guilds.at(*it)));
if (m_guilds.find(*it) != m_guilds.end())
sorted_guilds.push_back(std::make_pair(*it, m_guilds.at(*it)));
// now the rest go at the end in the order they are sorted
for (const auto &id : m_user_settings.GuildPositions) {
sorted_guilds.push_back(std::make_pair(id, m_guilds.at(id)));
if (m_guilds.find(id) != m_guilds.end())
sorted_guilds.push_back(std::make_pair(id, m_guilds.at(id)));
}
} else { // default sort is alphabetic
for (auto &it : m_guilds)