From 0b8c83eaa1fdb0fcb610f9181145abde3d60d803 Mon Sep 17 00:00:00 2001
From: ouwou <26526779+ouwou@users.noreply.github.com>
Date: Mon, 23 Nov 2020 20:34:09 -0500
Subject: progress 2

---
 components/chatwindow.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'components/chatwindow.cpp')

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);
         });
-- 
cgit v1.2.3