mirror of
https://github.com/celisej567/abaddon.git
synced 2026-09-27 16:16:35 +03:00
Merge branch 'master' into slowmode
This commit is contained in:
+6
-5
@@ -235,6 +235,12 @@ void Abaddon::DiscordOnMessageSent(const Message &data) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void Abaddon::DiscordOnDisconnect(bool is_reconnecting, GatewayCloseCode close_code) {
|
void Abaddon::DiscordOnDisconnect(bool is_reconnecting, GatewayCloseCode close_code) {
|
||||||
|
if (!is_reconnecting) {
|
||||||
|
m_channels_history_loaded.clear();
|
||||||
|
m_channels_history_loading.clear();
|
||||||
|
m_channels_requested.clear();
|
||||||
|
m_main_window->set_title(APP_TITLE);
|
||||||
|
}
|
||||||
m_main_window->UpdateComponents();
|
m_main_window->UpdateComponents();
|
||||||
if (close_code == GatewayCloseCode::AuthenticationFailed) {
|
if (close_code == GatewayCloseCode::AuthenticationFailed) {
|
||||||
Gtk::MessageDialog dlg(*m_main_window, "Discord rejected your token", false, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true);
|
Gtk::MessageDialog dlg(*m_main_window, "Discord rejected your token", false, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true);
|
||||||
@@ -423,11 +429,6 @@ void Abaddon::ActionConnect() {
|
|||||||
void Abaddon::ActionDisconnect() {
|
void Abaddon::ActionDisconnect() {
|
||||||
if (m_discord.IsStarted())
|
if (m_discord.IsStarted())
|
||||||
StopDiscord();
|
StopDiscord();
|
||||||
m_channels_history_loaded.clear();
|
|
||||||
m_channels_history_loading.clear();
|
|
||||||
m_channels_requested.clear();
|
|
||||||
m_main_window->set_title(APP_TITLE);
|
|
||||||
m_main_window->UpdateComponents();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void Abaddon::ActionSetToken() {
|
void Abaddon::ActionSetToken() {
|
||||||
|
|||||||
Reference in New Issue
Block a user