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

try and fix potential crash on ROLE_UPDATE

Browse Source
This commit is contained in:
ouwou
2021-09-24 01:55:41 -04:00
parent 3815d97f5f
commit 9755090c8c
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
windows/guildsettings/rolespane.cpp
View File

@@ -159,15 +159,7 @@ GuildSettingsRolesPaneRolesListItem::GuildSettingsRolesPaneRolesListItem(const G
UpdateItem(role);
discord.signal_role_update().connect([this, &discord](Snowflake guild_id, Snowflake role_id) {
if (guild_id != GuildID || role_id != RoleID) return;
const auto role = discord.GetRole(RoleID);
if (!role.has_value())
printf("nullopt??? %llu\n", (uint64_t)RoleID);
Position = role->Position;
UpdateItem(*role);
changed();
});
discord.signal_role_update().connect(sigc::mem_fun(*this, &GuildSettingsRolesPaneRolesListItem::OnRoleUpdate));
m_name.set_ellipsize(Pango::ELLIPSIZE_END);
@@ -190,6 +182,15 @@ void GuildSettingsRolesPaneRolesListItem::UpdateItem(const RoleData &role) {
m_name.set_text(role.Name);
}
void GuildSettingsRolesPaneRolesListItem::OnRoleUpdate(Snowflake guild_id, Snowflake role_id) {
if (guild_id != GuildID || role_id != RoleID) return;
const auto role = Abaddon::Get().GetDiscordClient().GetRole(RoleID);
if (!role.has_value()) return;
Position = role->Position;
UpdateItem(*role);
changed();
}
GuildSettingsRolesPaneInfo::GuildSettingsRolesPaneInfo(Snowflake guild_id)
: GuildID(guild_id)
, m_layout(Gtk::ORIENTATION_VERTICAL)

1
windows/guildsettings/rolespane.hpp
View File

@@ -16,6 +16,7 @@ public:
private:
void UpdateItem(const RoleData &role);
void OnRoleUpdate(Snowflake guild_id, Snowflake role_id);
Gtk::EventBox m_ev;
Gtk::Label m_name;