From 6a15f91a1482ee93e5809f15fbc48f9747ad68ee Mon Sep 17 00:00:00 2001 From: ouwou <26526779+ouwou@users.noreply.github.com> Date: Fri, 14 May 2021 23:43:37 -0400 Subject: set main window to invalid channel when looking at friends --- components/ratelimitindicator.cpp | 6 +++--- windows/mainwindow.cpp | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/components/ratelimitindicator.cpp b/components/ratelimitindicator.cpp index 52feed0..d962f98 100644 --- a/components/ratelimitindicator.cpp +++ b/components/ratelimitindicator.cpp @@ -31,9 +31,9 @@ RateLimitIndicator::RateLimitIndicator() void RateLimitIndicator::SetActiveChannel(Snowflake id) { m_active_channel = id; - const auto channel = *Abaddon::Get().GetDiscordClient().GetChannel(m_active_channel); - if (channel.RateLimitPerUser.has_value()) - m_rate_limit = *channel.RateLimitPerUser; + const auto channel = Abaddon::Get().GetDiscordClient().GetChannel(m_active_channel); + if (channel.has_value() && channel->RateLimitPerUser.has_value()) + m_rate_limit = *channel->RateLimitPerUser; else m_rate_limit = 0; diff --git a/windows/mainwindow.cpp b/windows/mainwindow.cpp index 6565e3b..863d437 100644 --- a/windows/mainwindow.cpp +++ b/windows/mainwindow.cpp @@ -87,6 +87,8 @@ MainWindow::MainWindow() }); m_menu_view_friends.signal_activate().connect([this] { + UpdateChatActiveChannel(Snowflake::Invalid); + m_members.UpdateMemberList(); m_content_stack.set_visible_child("friends"); }); -- cgit v1.2.3