Fix NPE

Stephen Paul Weber created 2 years ago

Change summary

src/main/java/eu/siacs/conversations/entities/Message.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Detailed changes

src/main/java/eu/siacs/conversations/entities/Message.java

@@ -1088,7 +1088,7 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
 
     public boolean wasMergedIntoPrevious() {
         Message prev = this.prev();
-        if (getModerated() != null && prev.getModerated() != null) return true;
+        if (prev != null && getModerated() != null && prev.getModerated() != null) return true;
         return prev != null && prev.mergeable(this);
     }