diff options
| author | ouwou <26526779+ouwou@users.noreply.github.com> | 2021-05-08 23:37:52 -0400 |
|---|---|---|
| committer | ouwou <26526779+ouwou@users.noreply.github.com> | 2021-05-08 23:37:52 -0400 |
| commit | abd2b9c71e98f3d9feab8d5b4d288b246015ee0d (patch) | |
| tree | aecc28fd04f15fd44cf88326739f140fb5421e48 /components | |
| parent | 78d3c5b679597dfa82910a6ea1e266349fa23a39 (diff) | |
| parent | 469053a14468f08dc694a1ef8d98f0265a72dd07 (diff) | |
| download | abaddon-portaudio-abd2b9c71e98f3d9feab8d5b4d288b246015ee0d.tar.gz abaddon-portaudio-abd2b9c71e98f3d9feab8d5b4d288b246015ee0d.zip | |
Merge branch 'master' into friends
Diffstat (limited to 'components')
| -rw-r--r-- | components/chatmessage.cpp | 6 | ||||
| -rw-r--r-- | components/chatwindow.cpp | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/components/chatmessage.cpp b/components/chatmessage.cpp index 68d2359..5f95b47 100644 --- a/components/chatmessage.cpp +++ b/components/chatmessage.cpp @@ -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() { diff --git a/components/chatwindow.cpp b/components/chatwindow.cpp index 1a2bb48..55ff06d 100644 --- a/components/chatwindow.cpp +++ b/components/chatwindow.cpp @@ -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) |