1 files changed, 9 insertions, 17 deletions

diff --git a/windows/mainwindow.cpp b/windows/mainwindow.cpp
index 4d6a1dc..2eb669e 100644
--- a/windows/mainwindow.cpp
+++ b/windows/mainwindow.cpp
@@ -32,10 +32,8 @@ MainWindow::MainWindow()
 
     m_menu_file.set_label("File");
     m_menu_file.set_submenu(m_menu_file_sub);
-    m_menu_file_reload_settings.set_label("Reload Settings");
     m_menu_file_reload_css.set_label("Reload CSS");
     m_menu_file_clear_cache.set_label("Clear file cache");
-    m_menu_file_sub.append(m_menu_file_reload_settings);
     m_menu_file_sub.append(m_menu_file_reload_css);
     m_menu_file_sub.append(m_menu_file_clear_cache);
 
@@ -76,10 +74,6 @@ MainWindow::MainWindow()
         m_signal_action_set_status.emit();
     });
 
-    m_menu_file_reload_settings.signal_activate().connect([this] {
-        m_signal_action_reload_settings.emit();
-    });
-
     m_menu_file_clear_cache.signal_activate().connect([this] {
         Abaddon::Get().GetImageManager().ClearCache();
     });
@@ -155,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();
@@ -265,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) {
@@ -312,10 +308,6 @@ MainWindow::type_signal_action_set_status MainWindow::signal_action_set_status()
     return m_signal_action_set_status;
 }
 
-MainWindow::type_signal_action_reload_settings MainWindow::signal_action_reload_settings() {
-    return m_signal_action_reload_settings;
-}
-
 MainWindow::type_signal_action_add_recipient MainWindow::signal_action_add_recipient() {
     return m_signal_action_add_recipient;
 }