celisej567/abaddon
1
0
Fork 0
mirror of https://github.com/celisej567/abaddon.git synced 2026-09-13 20:18:50 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into friends

Browse Source
This commit is contained in:
ouwou
2021-05-08 23:37:52 -04:00
parent 78d3c5b679 469053a144
commit abd2b9c71e
6 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/chatmessage.cpp
View File

@@ -143,8 +143,10 @@ void ChatMessageItemContainer::UpdateReactions() {
}
void ChatMessageItemContainer::SetFailed() {
m_text_component->get_style_context()->remove_class("pending");
m_text_component->get_style_context()->add_class("failed");
if (m_text_component != nullptr) {
m_text_component->get_style_context()->remove_class("pending");
m_text_component->get_style_context()->add_class("failed");
}
}
void ChatMessageItemContainer::UpdateAttributes() {

3
components/chatwindow.cpp
View File

@@ -200,6 +200,9 @@ bool ChatWindow::OnInputSubmit(const Glib::ustring &text) {
if (!m_rate_limit_indicator->CanSpeak())
return false;
if (text.size() == 0)
return false;
if (m_active_channel.IsValid())
m_signal_action_chat_submit.emit(text, m_active_channel, m_replying_to); // m_replying_to is checked for invalid in the handler
if (m_is_replying)