diff options
| -rw-r--r-- | abaddon.cpp | 3 | ||||
| -rw-r--r-- | discord/discord.cpp | 26 | ||||
| -rw-r--r-- | windows/mainwindow.cpp | 16 |
3 files changed, 24 insertions, 21 deletions
diff --git a/abaddon.cpp b/abaddon.cpp index a34ec2c..99a2520 100644 --- a/abaddon.cpp +++ b/abaddon.cpp @@ -432,8 +432,7 @@ void Abaddon::ActionConnect() { } void Abaddon::ActionDisconnect() { - if (m_discord.IsStarted()) - StopDiscord(); + StopDiscord(); } void Abaddon::ActionSetToken() { diff --git a/discord/discord.cpp b/discord/discord.cpp index 9e620e3..fab2c49 100644 --- a/discord/discord.cpp +++ b/discord/discord.cpp @@ -24,6 +24,8 @@ DiscordClient::DiscordClient(bool mem_store) } void DiscordClient::Start() { + if (m_client_started) return; + m_http.SetBase(GetAPIURL()); std::memset(&m_zstream, 0, sizeof(m_zstream)); @@ -37,22 +39,22 @@ void DiscordClient::Start() { } void DiscordClient::Stop() { - m_client_started = false; + if (m_client_started) { + inflateEnd(&m_zstream); + m_compressed_buf.clear(); - if (!m_client_connected) return; - - inflateEnd(&m_zstream); - m_compressed_buf.clear(); + m_heartbeat_waiter.kill(); + if (m_heartbeat_thread.joinable()) m_heartbeat_thread.join(); + m_client_connected = false; + m_reconnecting = false; - m_heartbeat_waiter.kill(); - if (m_heartbeat_thread.joinable()) m_heartbeat_thread.join(); - m_client_connected = false; - m_reconnecting = false; + m_store.ClearAll(); + m_guild_to_users.clear(); - m_store.ClearAll(); - m_guild_to_users.clear(); + m_websocket.Stop(); + } - m_websocket.Stop(); + m_client_started = false; } bool DiscordClient::IsStarted() const { diff --git a/windows/mainwindow.cpp b/windows/mainwindow.cpp index 35846b7..2eb669e 100644 --- a/windows/mainwindow.cpp +++ b/windows/mainwindow.cpp @@ -149,13 +149,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(); @@ -259,6 +252,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) { |