diff options
| author | ouwou <26526779+ouwou@users.noreply.github.com> | 2021-07-12 19:06:00 -0400 |
|---|---|---|
| committer | ouwou <26526779+ouwou@users.noreply.github.com> | 2021-07-12 19:06:00 -0400 |
| commit | f60e2cd6bd0ebbb0dfc9ce4f599a5daabf646b90 (patch) | |
| tree | 4fdf02d17dc525c5e6dad4664598e185ec0d018a /windows | |
| parent | ecf8fb6a5f0cdd674c79fec78698aa66099f5fc7 (diff) | |
| parent | ccf7c414be476d9be601a3dfe0e0030dedc0a91c (diff) | |
| download | abaddon-portaudio-f60e2cd6bd0ebbb0dfc9ce4f599a5daabf646b90.tar.gz abaddon-portaudio-f60e2cd6bd0ebbb0dfc9ce4f599a5daabf646b90.zip | |
Merge branch 'master' into channels-list
Diffstat (limited to 'windows')
| -rw-r--r-- | windows/mainwindow.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/windows/mainwindow.cpp b/windows/mainwindow.cpp index 77bd6d3..dc9c51d 100644 --- a/windows/mainwindow.cpp +++ b/windows/mainwindow.cpp @@ -148,13 +148,6 @@ MainWindow::MainWindow() void MainWindow::UpdateComponents() { bool discord_active = Abaddon::Get().IsDiscordActive(); - std::string token = Abaddon::Get().GetDiscordToken(); - m_menu_discord_connect.set_sensitive(token.size() > 0 && !discord_active); - m_menu_discord_disconnect.set_sensitive(discord_active); - m_menu_discord_join_guild.set_sensitive(discord_active); - m_menu_discord_set_token.set_sensitive(!discord_active); - m_menu_discord_set_status.set_sensitive(discord_active); - if (!discord_active) { m_chat.Clear(); m_members.Clear(); @@ -258,6 +251,15 @@ void MainWindow::OnDiscordSubmenuPopup(const Gdk::Rectangle *flipped_rect, const m_menu_discord_add_recipient.set_visible(false); if (channel.has_value() && channel->GetDMRecipients().size() + 1 < 10) m_menu_discord_add_recipient.set_visible(channel->Type == ChannelType::GROUP_DM); + + const bool discord_active = Abaddon::Get().GetDiscordClient().IsStarted(); + + std::string token = Abaddon::Get().GetDiscordToken(); + m_menu_discord_connect.set_sensitive(token.size() > 0 && !discord_active); + m_menu_discord_disconnect.set_sensitive(discord_active); + m_menu_discord_join_guild.set_sensitive(discord_active); + m_menu_discord_set_token.set_sensitive(!discord_active); + m_menu_discord_set_status.set_sensitive(discord_active); } void MainWindow::OnViewSubmenuPopup(const Gdk::Rectangle *flipped_rect, const Gdk::Rectangle *final_rect, bool flipped_x, bool flipped_y) { |