From b28115eb37e44d7c6cc3c6bf7292feea0f6a35c6 Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Sun, 28 Jul 2019 16:50:04 +0200
Subject: [PATCH] Fix message_type not being initialized correctly

Fixes "sent an audio file" replies, that were actually replies to text
messages.
---
 src/timeline/TimelineItem.cpp | 12 ++++++++++++
 src/timeline/TimelineItem.h   |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/timeline/TimelineItem.cpp b/src/timeline/TimelineItem.cpp
index c0d7f97f..dd3b48c3 100644
--- a/src/timeline/TimelineItem.cpp
+++ b/src/timeline/TimelineItem.cpp
@@ -282,6 +282,7 @@ TimelineItem::TimelineItem(mtx::events::MessageType ty,
                            const QString &room_id,
                            QWidget *parent)
   : QWidget(parent)
+  , message_type_(ty)
   , room_id_{room_id}
 {
         init();
@@ -341,6 +342,7 @@ TimelineItem::TimelineItem(ImageItem *image,
                            const QString &room_id,
                            QWidget *parent)
   : QWidget{parent}
+  , message_type_(mtx::events::MessageType::Image)
   , room_id_{room_id}
 {
         init();
@@ -356,6 +358,7 @@ TimelineItem::TimelineItem(FileItem *file,
                            const QString &room_id,
                            QWidget *parent)
   : QWidget{parent}
+  , message_type_(mtx::events::MessageType::File)
   , room_id_{room_id}
 {
         init();
@@ -369,6 +372,7 @@ TimelineItem::TimelineItem(AudioItem *audio,
                            const QString &room_id,
                            QWidget *parent)
   : QWidget{parent}
+  , message_type_(mtx::events::MessageType::Audio)
   , room_id_{room_id}
 {
         init();
@@ -382,6 +386,7 @@ TimelineItem::TimelineItem(VideoItem *video,
                            const QString &room_id,
                            QWidget *parent)
   : QWidget{parent}
+  , message_type_(mtx::events::MessageType::Video)
   , room_id_{room_id}
 {
         init();
@@ -395,6 +400,7 @@ TimelineItem::TimelineItem(ImageItem *image,
                            const QString &room_id,
                            QWidget *parent)
   : QWidget(parent)
+  , message_type_(mtx::events::MessageType::Image)
   , room_id_{room_id}
 {
         setupWidgetLayout<mtx::events::RoomEvent<mtx::events::msg::Image>, ImageItem>(
@@ -426,6 +432,7 @@ TimelineItem::TimelineItem(FileItem *file,
                            const QString &room_id,
                            QWidget *parent)
   : QWidget(parent)
+  , message_type_(mtx::events::MessageType::File)
   , room_id_{room_id}
 {
         setupWidgetLayout<mtx::events::RoomEvent<mtx::events::msg::File>, FileItem>(
@@ -440,6 +447,7 @@ TimelineItem::TimelineItem(AudioItem *audio,
                            const QString &room_id,
                            QWidget *parent)
   : QWidget(parent)
+  , message_type_(mtx::events::MessageType::Audio)
   , room_id_{room_id}
 {
         setupWidgetLayout<mtx::events::RoomEvent<mtx::events::msg::Audio>, AudioItem>(
@@ -454,6 +462,7 @@ TimelineItem::TimelineItem(VideoItem *video,
                            const QString &room_id,
                            QWidget *parent)
   : QWidget(parent)
+  , message_type_(mtx::events::MessageType::Video)
   , room_id_{room_id}
 {
         setupWidgetLayout<mtx::events::RoomEvent<mtx::events::msg::Video>, VideoItem>(
@@ -470,6 +479,7 @@ TimelineItem::TimelineItem(const mtx::events::RoomEvent<mtx::events::msg::Notice
                            const QString &room_id,
                            QWidget *parent)
   : QWidget(parent)
+  , message_type_(mtx::events::MessageType::Notice)
   , room_id_{room_id}
 {
         init();
@@ -517,6 +527,7 @@ TimelineItem::TimelineItem(const mtx::events::RoomEvent<mtx::events::msg::Emote>
                            const QString &room_id,
                            QWidget *parent)
   : QWidget(parent)
+  , message_type_(mtx::events::MessageType::Emote)
   , room_id_{room_id}
 {
         init();
@@ -565,6 +576,7 @@ TimelineItem::TimelineItem(const mtx::events::RoomEvent<mtx::events::msg::Text>
                            const QString &room_id,
                            QWidget *parent)
   : QWidget(parent)
+  , message_type_(mtx::events::MessageType::Text)
   , room_id_{room_id}
 {
         init();
diff --git a/src/timeline/TimelineItem.h b/src/timeline/TimelineItem.h
index c0dab6b8..a3294d3f 100644
--- a/src/timeline/TimelineItem.h
+++ b/src/timeline/TimelineItem.h
@@ -277,7 +277,7 @@ private:
         QFutureWatcher<QString> *colorGenerating_;
 
         QString event_id_;
-        mtx::events::MessageType message_type_;
+        mtx::events::MessageType message_type_     = mtx::events::MessageType::Unknown;
         QString room_id_;
 
         DescInfo descriptionMsg_;