diff options
| author | ouwou <26526779+ouwou@users.noreply.github.com> | 2020-11-23 20:34:09 -0500 |
|---|---|---|
| committer | ouwou <26526779+ouwou@users.noreply.github.com> | 2020-11-23 20:34:09 -0500 |
| commit | 0b8c83eaa1fdb0fcb610f9181145abde3d60d803 (patch) | |
| tree | 9897253c0018fb89e2acdf5f3effe2a2e8b02294 /components/chatwindow.cpp | |
| parent | deb482a8db55874a536b6efec366343280214e48 (diff) | |
| download | abaddon-portaudio-0b8c83eaa1fdb0fcb610f9181145abde3d60d803.tar.gz abaddon-portaudio-0b8c83eaa1fdb0fcb610f9181145abde3d60d803.zip | |
progress 2
Diffstat (limited to 'components/chatwindow.cpp')
| -rw-r--r-- | components/chatwindow.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/components/chatwindow.cpp b/components/chatwindow.cpp index 1d8829c..6f9e1c6 100644 --- a/components/chatwindow.cpp +++ b/components/chatwindow.cpp @@ -157,8 +157,8 @@ ChatMessageItemContainer *ChatWindow::CreateMessageComponent(Snowflake id) { void ChatWindow::ProcessNewMessage(Snowflake id, bool prepend) { const auto &client = Abaddon::Get().GetDiscordClient(); if (!client.IsStarted()) return; // e.g. load channel and then dc - const auto *data = client.GetMessage(id); - if (data == nullptr) return; + const auto data = client.GetMessage(id); + if (!data.has_value()) return; ChatMessageHeader *last_row = nullptr; bool should_attach = false; @@ -182,7 +182,7 @@ void ChatWindow::ProcessNewMessage(Snowflake id, bool prepend) { const auto user = client.GetUser(user_id); if (!user.has_value()) return; - header = Gtk::manage(new ChatMessageHeader(data)); + header = Gtk::manage(new ChatMessageHeader(&*data)); header->signal_action_insert_mention().connect([this, user_id]() { m_signal_action_insert_mention.emit(user_id); }); |