From fee8f42d83e1dd964b8432c0ee6da308ae347dcc Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Sun, 29 Jul 2018 16:26:54 +0200
Subject: null pointer check in notification service

---
 src/main/java/de/pixart/messenger/services/NotificationService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/java')

diff --git a/src/main/java/de/pixart/messenger/services/NotificationService.java b/src/main/java/de/pixart/messenger/services/NotificationService.java
index 9f8438de3..7fa091478 100644
--- a/src/main/java/de/pixart/messenger/services/NotificationService.java
+++ b/src/main/java/de/pixart/messenger/services/NotificationService.java
@@ -181,7 +181,7 @@ public class NotificationService {
     public void push(final Message message) {
         synchronized (CATCHUP_LOCK) {
             final XmppConnection connection = message.getConversation().getAccount().getXmppConnection();
-            if (connection.isWaitingForSmCatchup()) {
+            if (connection != null && connection.isWaitingForSmCatchup()) {
                 connection.incrementSmCatchupMessageCounter();
                 pushFromBacklog(message);
             } else {
-- 
cgit v1.2.3