From 8c2d867f189a89bb7b73758782e25d33864ab12b Mon Sep 17 00:00:00 2001
From: Black Hat <bhat@encom.eu.org>
Date: Thu, 8 Aug 2019 12:11:33 +0800
Subject: [PATCH] Display edits. Additional condition check.

---
 imports/Spectral/Panel/RoomListPanel.qml | 2 +-
 src/messageeventmodel.cpp                | 3 +++
 src/spectralroom.cpp                     | 5 ++++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/imports/Spectral/Panel/RoomListPanel.qml b/imports/Spectral/Panel/RoomListPanel.qml
index e72805523..223129d6d 100644
--- a/imports/Spectral/Panel/RoomListPanel.qml
+++ b/imports/Spectral/Panel/RoomListPanel.qml
@@ -289,7 +289,7 @@ Item {
                     }
                 }
 
-                RippleEffect {
+                AutoMouseArea {
                     anchors.fill: parent
 
                     onPrimaryClicked: {
diff --git a/src/messageeventmodel.cpp b/src/messageeventmodel.cpp
index d3de9af34..51bf839be 100644
--- a/src/messageeventmodel.cpp
+++ b/src/messageeventmodel.cpp
@@ -138,6 +138,9 @@ void MessageEventModel::setRoom(SpectralRoom* room) {
             });
     connect(m_currentRoom, &Room::updatedEvent, this,
             [this](const QString& eventId) {
+              if (eventId.isEmpty()) {  // How did we get here?
+                return;
+              }
               refreshEventRoles(eventId, {ReactionRole, Qt::DisplayRole});
             });
     connect(m_currentRoom, &Room::fileTransferProgress, this,
diff --git a/src/spectralroom.cpp b/src/spectralroom.cpp
index ae9636820..29daccf51 100644
--- a/src/spectralroom.cpp
+++ b/src/spectralroom.cpp
@@ -152,7 +152,10 @@ void SpectralRoom::onAddHistoricalTimelineEvents(rev_iter_t from) {
 void SpectralRoom::onRedaction(const RoomEvent& prevEvent,
                                const RoomEvent& /*after*/) {
   if (const auto& e = eventCast<const ReactionEvent>(&prevEvent)) {
-    emit updatedEvent(e->relation().eventId);
+    if (auto relatedEventId = e->relation().eventId;
+        !relatedEventId.isEmpty()) {
+      emit updatedEvent(relatedEventId);
+    }
   }
 }