Merge branch 'master' into tabs

This commit is contained in:
ouwou
2022-04-17 02:20:34 -04:00
4 changed files with 14 additions and 7 deletions

View File

@@ -164,6 +164,8 @@ int Abaddon::StartGTK() {
m_gtk_app->signal_shutdown().connect(sigc::mem_fun(*this, &Abaddon::OnShutdown), false);
m_main_window->UpdateMenus();
m_main_window->show();
return m_gtk_app->run(*m_main_window);
}
@@ -183,11 +185,13 @@ void Abaddon::LoadFromSettings() {
void Abaddon::StartDiscord() {
m_discord.Start();
m_main_window->UpdateMenus();
}
void Abaddon::StopDiscord() {
m_discord.Stop();
SaveState();
m_main_window->UpdateMenus();
}
bool Abaddon::IsDiscordActive() const {
@@ -545,6 +549,7 @@ void Abaddon::ActionSetToken() {
m_main_window->UpdateComponents();
GetSettings().DiscordToken = m_discord_token;
}
m_main_window->UpdateMenus();
}
void Abaddon::ActionJoinGuildDialog() {
@@ -605,6 +610,8 @@ void Abaddon::ActionChannelOpened(Snowflake id) {
ShowGuildVerificationGateDialog(*channel->GuildID);
}
}
m_main_window->UpdateMenus();
}
void Abaddon::ActionChatLoadHistory(Snowflake id) {